From 05a160bf67efe3581b911da2797886e5cdbe2534 Mon Sep 17 00:00:00 2001 From: learn_more Date: Sun, 24 Aug 2014 20:12:58 +0200 Subject: [PATCH] self-containing header --- blendish.h | 22 ++++++++++++++++++++++ compat.h | 24 ------------------------ 2 files changed, 22 insertions(+), 24 deletions(-) delete mode 100644 compat.h diff --git a/blendish.h b/blendish.h index a3998fd..22e57bf 100644 --- a/blendish.h +++ b/blendish.h @@ -577,6 +577,28 @@ NVGcolor bndNodeWireColor(const BNDnodeTheme *theme, BNDwidgetState state); #else #define BND_INLINE #endif + +static float fminf ( float a, float b ) +{ + return _isnan(a) ? b : ( _isnan(b) ? a : ((a < b) ? a : b)); +} + +static float fmaxf ( float a, float b ) +{ + return _isnan(a) ? b : ( _isnan(b) ? a : ((a > b) ? a : b)); +} + +static double fmin ( double a, double b ) +{ + return _isnan(a) ? b : ( _isnan(b) ? a : ((a < b) ? a : b)); +} + +static double fmax ( double a, double b ) +{ + return _isnan(a) ? b : ( _isnan(b) ? a : ((a > b) ? a : b)); +} + + #else #define BND_INLINE inline #endif diff --git a/compat.h b/compat.h deleted file mode 100644 index 9302161..0000000 --- a/compat.h +++ /dev/null @@ -1,24 +0,0 @@ - -#ifdef _MSC_VER - -static float fminf ( float a, float b ) -{ - return _isnan(a) ? b : ( _isnan(b) ? a : ((a < b) ? a : b)); -} - -static float fmaxf ( float a, float b ) -{ - return _isnan(a) ? b : ( _isnan(b) ? a : ((a > b) ? a : b)); -} - -static double fmin ( double a, double b ) -{ - return _isnan(a) ? b : ( _isnan(b) ? a : ((a < b) ? a : b)); -} - -static double fmax ( double a, double b ) -{ - return _isnan(a) ? b : ( _isnan(b) ? a : ((a > b) ? a : b)); -} -#endif -