From 0ec4d68600b83d41d2e48ad35d18e2a00f234619 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 21 9月 2019 01:34:22 +0800
Subject: [PATCH] Merge branch 'develop' of https://github.com/open-license-manager/open-license-manager into develop
---
src/library/base/base.h | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/library/base/base.h b/src/library/base/base.h
index d57835e..6ad0bc6 100644
--- a/src/library/base/base.h
+++ b/src/library/base/base.h
@@ -7,7 +7,6 @@
#endif
#ifdef __unix__
-
#include <limits.h>
#define DllExport
#ifndef MAX_PATH
@@ -17,10 +16,20 @@
#else //windows
#include <windows.h>
#define DllExport __declspec( dllexport )
+
+#ifndef __cplusplus
+#ifndef _MSC_VER
+#include <stdbool.h>
+#else
+typedef int bool;
+#define false 0
+#define true -1
+#endif
#endif
+#endif
/* #define _DEBUG */
-/*
+
#define cmax(a,b) \
({ __typeof__ (a) _a = (a); \
__typeof__ (b) _b = (b); \
@@ -30,7 +39,7 @@
({ __typeof__ (a) _a = (a); \
__typeof__ (b) _b = (b); \
_a < _b ? _a : _b; })
-*/
+
typedef enum {
FUNC_RET_OK, FUNC_RET_NOT_AVAIL, FUNC_RET_ERROR, FUNC_RET_BUFFER_TOO_SMALL
} FUNCTION_RETURN;
--
Gitblit v1.9.1