From 4467a957a498b93dbcaefbad97df24b43dfbc99d Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周日, 08 3月 2020 22:16:09 +0800
Subject: [PATCH] fix tests

---
 src/library/base/base.h |   42 +++++++++++++++++++++++++-----------------
 1 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/src/library/base/base.h b/src/library/base/base.h
index 6623b20..978298d 100644
--- a/src/library/base/base.h
+++ b/src/library/base/base.h
@@ -1,7 +1,6 @@
 #ifndef BASE_H_
 #define BASE_H_
 
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -10,35 +9,44 @@
 #include <limits.h>
 #define DllExport
 #ifndef MAX_PATH
-	#define MAX_PATH PATH_MAX
+#define MAX_PATH PATH_MAX
 #endif
 
-#else //windows
+#else  // windows
 #include <windows.h>
-#define DllExport  __declspec( dllexport )
+#define DllExport __declspec(dllexport)
 
 #ifndef __cplusplus
+#ifndef _MSC_VER
+#include <stdbool.h>
+#else
 typedef int bool;
 #define false 0
-#define true -1
+#define true - 1
+#endif
 #endif
 
 #endif
-/* #define _DEBUG */
 
-#define cmax(a,b) \
-   ({ __typeof__ (a) _a = (a); \
-       __typeof__ (b) _b = (b); \
-     _a > _b ? _a : _b; })
+// license file parameters
+#define PARAM_EXPIRY_DATE "valid-to"
+#define PARAM_BEGIN_DATE "valid-from"
+#define PARAM_VERSION_FROM "start-version"
+#define PARAM_CLIENT_SIGNATURE "client-signature"
+#define PARAM_VERSION_TO "end-version"
+#define PARAM_EXTRA_DATA "extra-data"
+// license file extra entries
+#define LICENSE_SIGNATURE "sig"
+#define LICENSE_VERSION "lic_ver"
 
-#define cmin(a,b) \
-   ({ __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;
 
-typedef enum  {
-	FUNC_RET_OK, FUNC_RET_NOT_AVAIL, FUNC_RET_ERROR, FUNC_RET_BUFFER_TOO_SMALL
-} FUNCTION_RETURN;
+#define cmin(a, b)              \
+	({                          \
+		__typeof__(a) _a = (a); \
+		__typeof__(b) _b = (b); \
+		_a < _b ? _a : _b;      \
+	})
 
 #ifdef __cplusplus
 }

--
Gitblit v1.9.1