Estimation DLL: remove warning about NOMINMAX

2011-02-07 12:37:34 +01:00 · 2011-02-07 12:37:34 +01:00 · 3fa2339cfe
parent ca88c39136
commit 3fa2339cfe
1 changed files with 3 additions and 1 deletions
--- a/mex/sources/estimation/utils/dynamic_dll.hh
+++ b/mex/sources/estimation/utils/dynamic_dll.hh
@ -18,7 +18,9 @@
 */

 #if defined(_WIN32) || defined(__CYGWIN32__)
-# define NOMINMAX // Do not define "min" and "max" macros
+# ifndef NOMINMAX
+#  define NOMINMAX // Do not define "min" and "max" macros
+# endif
 # include <windows.h>
 #else
 # include <dlfcn.h> // unix/linux DLL (.so) handling routines