From c0d61ea38a684301c6937d8d4067765abdc5aaaa Mon Sep 17 00:00:00 2001 From: Maximilien Siavelis <m@siav.pw> Date: ćšć, 08 8æ 2019 02:47:00 +0800 Subject: [PATCH] Merge pull request #26 from emgstabilis/25-generation-of-pc-identifier-fails-with-default-strategy-if-no-disk --- src/library/base/base.h | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/library/base/base.h b/src/library/base/base.h index 5656315..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,9 +39,9 @@ ({ __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