From 5a8a12d7a2c69610cd7a9a00ed1b3579b750a914 Mon Sep 17 00:00:00 2001 From: gcontini <1121667+gcontini@users.noreply.github.com> Date: 周六, 16 11月 2019 21:39:10 +0800 Subject: [PATCH] issue #42 #38 \n review build system, \n issue #38 added clang format --- src/library/base/base.h | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/library/base/base.h b/src/library/base/base.h index 5656315..898688f 100644 --- a/src/library/base/base.h +++ b/src/library/base/base.h @@ -1,13 +1,11 @@ #ifndef BASE_H_ #define BASE_H_ - #ifdef __cplusplus extern "C" { #endif #ifdef __unix__ - #include <limits.h> #define DllExport #ifndef MAX_PATH @@ -17,22 +15,27 @@ #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