From 7b1a88ee373fdb44ab269daf84958f6bc66705e4 Mon Sep 17 00:00:00 2001 From: Gabriele Contini <contini.mailing@gmail.com> Date: 周日, 13 10月 2019 20:02:13 +0800 Subject: [PATCH] test Linux --- src/library/base/base.h | 33 ++++++++++++++++++++------------- 1 files changed, 20 insertions(+), 13 deletions(-) diff --git a/src/library/base/base.h b/src/library/base/base.h index fb5270f..898688f 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 @@ -9,26 +8,34 @@ #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 -/* -#define cmax(a,b) \ - ({ __typeof__ (a) _a = (a); \ - __typeof__ (b) _b = (b); \ - _a > _b ? _a : _b; }) +#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 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