re-adding nominmax define to gl2ps, refs #3

git-svn-id: file:///home/behr_mi/git/sumo_synched/trunk@15332 afbd958f-9f77-42d5-a016-97a22340ccf4
eclipse-sumo · Dec 16, 2013 · fab512e · fab512e
1 parent 3348e76
commit fab512e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/sumo/src/foreign/additional.txt b/sumo/src/foreign/additional.txt
@@ -39,5 +39,5 @@ The subfolders contain additional libraries used by SUMO:
 - gl2ps
  Printing screenshots as ps or pdf files
  Used version: 1.3.8
- Modifications: fixing warnings (casting, initializing variables)
+ Modifications: fixing warnings (casting, initializing variables), adding NOMINMAX define before windows.h include
  Original page: http://www.geuz.org/gl2ps/
diff --git a/sumo/src/foreign/gl2ps/gl2ps.h b/sumo/src/foreign/gl2ps/gl2ps.h
@@ -46,7 +46,9 @@
 #    pragma warning(disable:4115)
 #    pragma warning(disable:4996)
 #  endif
+#  define NOMINMAX
 #  include <windows.h>
+#  undef NOMINMAX
 #  if defined(GL2PSDLL)
 #    if defined(GL2PSDLL_EXPORTS)
 #      define GL2PSDLL_API __declspec(dllexport)