From 0d8b39c94e9bee14ec9c33fa6a53c48f20f0ac70 Mon Sep 17 00:00:00 2001
From: Maximilien Siavelis <maximilien.siavelis@simulease.com>
Date: 周日, 21 4月 2019 23:06:05 +0800
Subject: [PATCH] copy ini/SimpleIni.h into install directory
---
src/library/base/base.h | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/src/library/base/base.h b/src/library/base/base.h
index eccdb76..6ad0bc6 100644
--- a/src/library/base/base.h
+++ b/src/library/base/base.h
@@ -9,16 +9,39 @@
#ifdef __unix__
#include <limits.h>
#define DllExport
-#define MAX_PATH PATH_MAX
-#else
-#include <windows.h>
-#define DllExport __declspec( dllexport )
+#ifndef MAX_PATH
+ #define MAX_PATH PATH_MAX
#endif
-#define _DEBUG
+#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); \
+ _a > _b ? _a : _b; })
+
+#define cmin(a,b) \
+ ({ __typeof__ (a) _a = (a); \
+ __typeof__ (b) _b = (b); \
+ _a < _b ? _a : _b; })
typedef enum {
- OK, NOOK, ERROR, BUFFER_TOO_SMALL
+ FUNC_RET_OK, FUNC_RET_NOT_AVAIL, FUNC_RET_ERROR, FUNC_RET_BUFFER_TOO_SMALL
} FUNCTION_RETURN;
#ifdef __cplusplus
--
Gitblit v1.9.1