From 0f2ebdb0b66178fa90492d1c46412eddeed9ae6d Mon Sep 17 00:00:00 2001 From: Maximilien Siavelis <m@siav.pw> Date: 周日, 16 6月 2019 19:45:41 +0800 Subject: [PATCH] Merge pull request #23 from tizzybec/master --- src/library/base/base.h | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/library/base/base.h b/src/library/base/base.h index 6c0ed67..6ad0bc6 100644 --- a/src/library/base/base.h +++ b/src/library/base/base.h @@ -18,14 +18,18 @@ #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); \ @@ -35,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