From 8d405b265285c368df2e9cf1c14acee7532e0ee7 Mon Sep 17 00:00:00 2001 From: nancy.liao <huihui.liao@greentest.com.cn> Date: ćšć, 29 5æ 2025 18:14:38 +0800 Subject: [PATCH] Merge branch 'develop' of http://139.9.88.116:3000/r/module/open-license-manager into develop --- src/library/base/base.h | 53 +++++++++++++++++++++++++++++++++++------------------ 1 files changed, 35 insertions(+), 18 deletions(-) diff --git a/src/library/base/base.h b/src/library/base/base.h index fb5270f..978298d 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,27 +8,45 @@ #ifdef __unix__ #include <limits.h> #define DllExport +#ifndef MAX_PATH #define MAX_PATH PATH_MAX -#else -#include <windows.h> -#define DllExport __declspec( dllexport ) #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) -#define cmin(a,b) \ - ({ __typeof__ (a) _a = (a); \ - __typeof__ (b) _b = (b); \ - _a < _b ? _a : _b; }) -*/ -typedef enum { - OK, NOOK, ERROR, BUFFER_TOO_SMALL -} FUNCTION_RETURN; +#ifndef __cplusplus +#ifndef _MSC_VER +#include <stdbool.h> +#else +typedef int bool; +#define false 0 +#define true - 1 +#endif +#endif + +#endif + +// license file parameters +#define PARAM_EXPIRY_DATE "valid-to" +#define PARAM_BEGIN_DATE "valid-from" +#define PARAM_VERSION_FROM "start-version" +#define PARAM_CLIENT_SIGNATURE "client-signature" +#define PARAM_VERSION_TO "end-version" +#define PARAM_EXTRA_DATA "extra-data" +// license file extra entries +#define LICENSE_SIGNATURE "sig" +#define LICENSE_VERSION "lic_ver" + +typedef enum { FUNC_RET_OK, FUNC_RET_NOT_AVAIL, FUNC_RET_ERROR, FUNC_RET_BUFFER_TOO_SMALL } FUNCTION_RETURN; + +#define cmin(a, b) \ + ({ \ + __typeof__(a) _a = (a); \ + __typeof__(b) _b = (b); \ + _a < _b ? _a : _b; \ + }) #ifdef __cplusplus } -- Gitblit v1.9.1