diff options
Diffstat (limited to 'internal/ceres/mutex.h')
| -rw-r--r-- | internal/ceres/mutex.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/internal/ceres/mutex.h b/internal/ceres/mutex.h index 0c48ed3..97e2cd3 100644 --- a/internal/ceres/mutex.h +++ b/internal/ceres/mutex.h @@ -95,6 +95,8 @@ #ifndef CERES_INTERNAL_MUTEX_H_ #define CERES_INTERNAL_MUTEX_H_ +#include "ceres/internal/port.h" + #if defined(CERES_NO_THREADS) typedef int MutexType; // to keep a lock-count #elif defined(_WIN32) || defined(__CYGWIN32__) || defined(__CYGWIN64__) @@ -112,7 +114,9 @@ // To avoid macro definition of ERROR. # define NOGDI // To avoid macro definition of min/max. -# define NOMINMAX +# ifndef NOMINMAX +# define NOMINMAX +# endif # include <windows.h> typedef CRITICAL_SECTION MutexType; #elif defined(CERES_HAVE_PTHREAD) && defined(CERES_HAVE_RWLOCK) |