From 3c34d8d6d83a34e3bcdb7041be1cbd784a17bbb5 Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周六, 30 11月 2019 14:56:39 +0800
Subject: [PATCH] Merge branch 'feature/issue_licenses_42' of https://github.com/open-license-manager/open-license-manager.git into feature/issue_licenses_42
---
src/library/os/os.h | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/library/os/os.h b/src/library/os/os.h
index 11aa844..f32ca92 100644
--- a/src/library/os/os.h
+++ b/src/library/os/os.h
@@ -2,7 +2,7 @@
* os-dependent.hpp
*
* Created on: Mar 29, 2014
- *
+ *
*/
#ifndef OS_DEPENDENT_HPP_
@@ -25,7 +25,7 @@
#endif
typedef enum {
- NONE, VMWARE
+ NONE, CONTAINER, VM
} VIRTUALIZATION;
typedef enum {
@@ -77,7 +77,15 @@
VIRTUALIZATION getVirtualization();
void os_initialize();
-FUNCTION_RETURN verifySignature(const char* stringToVerify, const char* signatureB64);
+// FUNCTION_RETURN verifySignature(const char* stringToVerify, const char* signatureB64);
+
+#ifdef _WIN32
+#define SETENV(VAR,VAL) _putenv_s(VAR, VAL);
+#define UNSETENV(P) _putenv_s(P, "");
+#else
+#define SETENV(VAR,VAL) setenv(VAR, VAL, 1);
+#define UNSETENV(P) unsetenv(P);
+#endif
#ifdef __cplusplus
}
--
Gitblit v1.9.1