diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-09-11 19:59:22 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-09-11 19:59:22 +0000 |
| commit | 34e2a96d0bdc8641c6a17220078d816ae6134d97 (patch) | |
| tree | 58d632c97d544cbabc0e23422eb7bbd810f5551f | |
| parent | 52bcaf69af42c9e50adda2b1e6dfeb2b6f35f08b (diff) | |
Define NOMINMAX for the entire Qt build.
svn path=/trunk/; revision=51955
| -rw-r--r-- | Makefile.nmake | 4 | ||||
| -rw-r--r-- | ui/qt/summary_dialog.cpp | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 42fa30a7f4..ad09fe9979 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -487,7 +487,9 @@ MSVC_VARIANT = $(MSVC_VARIANT) MSVCR_DLL = "$(MSVCR_DLL:\=/)" QMAKE_CFLAGS *= $(STANDARD_CFLAGS) $(PORTAUDIO_CFLAGS:\=/) -QMAKE_CXXFLAGS *= $(STANDARD_CFLAGS) $(PORTAUDIO_CFLAGS:\=/) +# NOMINMAX keeps windows.h from defining "min" and "max" via windef.h. +# This avoids conflicts with the C++ standard library. +QMAKE_CXXFLAGS *= $(STANDARD_CFLAGS) /DNOMINMAX $(PORTAUDIO_CFLAGS:\=/) QMAKE_LFLAGS *= /LARGEADDRESSAWARE $(LDFLAGS) <<KEEP diff --git a/ui/qt/summary_dialog.cpp b/ui/qt/summary_dialog.cpp index d8c08bc428..8c688b2936 100644 --- a/ui/qt/summary_dialog.cpp +++ b/ui/qt/summary_dialog.cpp @@ -23,10 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if defined(_WIN32) && !defined(NOMINMAX) -#define NOMINMAX -#endif - #include "summary_dialog.h" #include "ui_summary_dialog.h" |