diff --git a/ev_helpers.h b/ev_helpers.h index f1d4e7a..9298f48 100644 --- a/ev_helpers.h +++ b/ev_helpers.h @@ -23,12 +23,17 @@ evstring_readFile( #ifdef EV_HELPERS_IMPLEMENTATION #undef EV_HELPERS_IMPLEMENTATION + evstring evstring_readFile( evstring filePath) { FILE* f = NULL; +#if EV_OS_WINDOWS if(fopen_s(&f,filePath,"rb")) return EV_INVALID(evstring); +#else + f = fopen(filePath, "rb"); +#endif fseek(f, 0, SEEK_END); u32 buflen = ftell(f); diff --git a/ev_numeric.h b/ev_numeric.h index dc0584f..100a9b9 100644 --- a/ev_numeric.h +++ b/ev_numeric.h @@ -97,4 +97,15 @@ static const struct Float64Data Float64 = .EPS = 2.2204460492503131e-016 }; +#if !EV_OS_WINDOWS +#define max(a,b) \ + ({ __typeof__(a) _a = (a); \ + __typeof__(b) _b = (b); \ + _a > _b ? _a : _b; }) +#define min(a,b) \ + ({ __typeof__(a) _a = (a); \ + __typeof__(b) _b = (b); \ + _a < _b ? _a : _b; }) +#endif + #endif // EV_HEADERS_NUMERIC_H diff --git a/ev_vec.h b/ev_vec.h index c79f3c4..44e062e 100644 --- a/ev_vec.h +++ b/ev_vec.h @@ -6,6 +6,10 @@ #include "ev_types.h" #include "ev_numeric.h" +#if !EV_OS_WINDOWS +#include +#endif + #if defined(EV_VEC_SHARED) # if defined (EV_VEC_IMPL) # define EV_VEC_API EV_EXPORT