diff options
Diffstat (limited to 'Build/source/libs/poppler/poppler-0.25.2-PATCHES/patch-03-NOMINMAX')
-rw-r--r-- | Build/source/libs/poppler/poppler-0.25.2-PATCHES/patch-03-NOMINMAX | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/Build/source/libs/poppler/poppler-0.25.2-PATCHES/patch-03-NOMINMAX b/Build/source/libs/poppler/poppler-0.25.2-PATCHES/patch-03-NOMINMAX deleted file mode 100644 index 0ed8625003c..00000000000 --- a/Build/source/libs/poppler/poppler-0.25.2-PATCHES/patch-03-NOMINMAX +++ /dev/null @@ -1,53 +0,0 @@ -diff -ur poppler-0.25.2.orig/goo/GooMutex.h poppler-0.25.2/goo/GooMutex.h ---- poppler-0.25.2.orig/goo/GooMutex.h 2014-02-09 16:10:30.000000000 +0100 -+++ poppler-0.25.2/goo/GooMutex.h 2014-03-27 09:21:13.000000000 +0100 -@@ -41,7 +41,9 @@ - // gDestroyMutex(&m); - - #ifdef _WIN32 -+#ifndef NOMINMAX - #define NOMINMAX -+#endif - #include <windows.h> - - typedef CRITICAL_SECTION GooMutex; -diff -ur poppler-0.25.2.orig/goo/GooTimer.h poppler-0.25.2/goo/GooTimer.h ---- poppler-0.25.2.orig/goo/GooTimer.h 2014-02-09 16:10:30.000000000 +0100 -+++ poppler-0.25.2/goo/GooTimer.h 2014-03-27 09:21:13.000000000 +0100 -@@ -27,7 +27,9 @@ - #endif - - #ifdef _WIN32 -+#ifndef NOMINMAX - #define NOMINMAX -+#endif - #include <windows.h> - #endif - -diff -ur poppler-0.25.2.orig/goo/gfile.h poppler-0.25.2/goo/gfile.h ---- poppler-0.25.2.orig/goo/gfile.h 2014-02-09 16:10:31.000000000 +0100 -+++ poppler-0.25.2/goo/gfile.h 2014-03-27 09:21:13.000000000 +0100 -@@ -40,7 +40,9 @@ - # ifdef FPTEX - # include <win32lib.h> - # else -- #define NOMINMAX -+# ifndef NOMINMAX -+# define NOMINMAX -+# endif - # include <windows.h> - # endif - #elif defined(ACORN) -diff -ur poppler-0.25.2.orig/poppler/XpdfPluginAPI.h poppler-0.25.2/poppler/XpdfPluginAPI.h ---- poppler-0.25.2.orig/poppler/XpdfPluginAPI.h 2014-02-09 16:10:33.000000000 +0100 -+++ poppler-0.25.2/poppler/XpdfPluginAPI.h 2014-03-27 09:21:13.000000000 +0100 -@@ -23,7 +23,9 @@ - #define XPDFPLUGINAPI_H - - #ifdef _WIN32 -+#ifndef NOMINMAX - #define NOMINMAX -+#endif - #include <windows.h> - #else - #define Object XtObject |