Bug 830801 - Part 3. Remove NOMINMAX define from cpp source. r=mshal

mozilla-spidermonkey · Aug 3, 2015 · a2b8d63 · a2b8d63
1 parent 3f6cf20
commit a2b8d63
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 15 deletions.
diff --git a/config/gcc-stl-wrapper.template.h b/config/gcc-stl-wrapper.template.h
@@ -17,11 +17,6 @@
 // Silence "warning: #include_next is a GCC extension"
 #pragma GCC system_header
 
-#ifdef _WIN32
-// Suppress windef.h min and max macros - they make std::min/max not compile.
-#define NOMINMAX 1
-#endif
-
 // mozalloc.h wants <new>; break the cycle by always explicitly
 // including <new> here.  NB: this is a tad sneaky.  Sez the gcc docs:
 //

diff --git a/config/msvc-stl-wrapper.template.h b/config/msvc-stl-wrapper.template.h
@@ -12,9 +12,6 @@
 #  error "STL code can only be used with -fno-exceptions"
 #endif
 
-// Suppress windef.h min and max macros - they make std::min/max not compile.
-#define NOMINMAX 1
-
 // Code built with !_HAS_EXCEPTIONS calls std::_Throw(), but the win2k
 // CRT doesn't export std::_Throw().  So we define it.
 #ifndef mozilla_Throw_h

diff --git a/embedding/components/printingui/win/nsPrintDialogUtil.cpp b/embedding/components/printingui/win/nsPrintDialogUtil.cpp
@@ -20,8 +20,6 @@ WIN_LIBS=                                       \
 
 ---------------------------------------------------------------------- */
 
-#define NOMINMAX 1
-
 #include "plstr.h"
 #include <windows.h>
 #include <tchar.h>

diff --git a/memory/replace/logalloc/replay/Replay.cpp b/memory/replace/logalloc/replay/Replay.cpp
@@ -8,9 +8,6 @@
 #include "mozmemory_wrap.h"
 
 #ifdef _WIN32
-/* windef.h, which windows.h includes, #defines min and max, which
- * breaks std::min. Defining NOMINMAX prevents those #defines. */
-#define NOMINMAX
 #include <windows.h>
 #include <io.h>
 typedef int ssize_t;

diff --git a/toolkit/crashreporter/client/crashreporter_win.cpp b/toolkit/crashreporter/client/crashreporter_win.cpp
@@ -7,8 +7,6 @@
 #undef WIN32_LEAN_AND_MEAN
 #endif
 
-#define NOMINMAX
-
 #include "crashreporter.h"
 
 #include <windows.h>