[poppler] goo/gfile.h goo/GooMutex.h goo/GooTimer.h poppler/XpdfPluginAPI.h

[Albert Astals Cid]

 goo/GooMutex.h          |    3 +++
 goo/GooTimer.h          |    5 ++++-
 goo/gfile.h             |    5 ++++-
 poppler/XpdfPluginAPI.h |    3 +++
 4 files changed, 14 insertions(+), 2 deletions(-)

New commits:
commit 8d3a2c9d007052bcb8719200760a1abb6314f804
Author: Peter Breitenlohner <peb at mppmu.mpg.de>
Date:   Sun Mar 30 23:34:23 2014 +0200

    Avoid MinGW/Cygwin warnings due to redefinition of NOMINMAX

diff --git a/goo/GooMutex.h b/goo/GooMutex.h
index 4a7ed5f..b2714b0 100644
--- a/goo/GooMutex.h
+++ b/goo/GooMutex.h
@@ -20,6 +20,7 @@
 // Copyright (C) 2013 Albert Astals Cid <aacid at kde.org>
 // Copyright (C) 2013 Adam Reichold <adamreichold at myopera.com>
 // Copyright (C) 2014 Bogdan Cristea <cristeab at gmail.com>
+// Copyright (C) 2014 Peter Breitenlohner <peb at mppmu.mpg.de>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
@@ -41,7 +42,9 @@
 // gDestroyMutex(&m);
 
 #ifdef _WIN32
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include <windows.h>
 
 typedef CRITICAL_SECTION GooMutex;
diff --git a/goo/GooTimer.h b/goo/GooTimer.h
index 7bbe9f0..ac64f6b 100644
--- a/goo/GooTimer.h
+++ b/goo/GooTimer.h
@@ -8,7 +8,8 @@
 // Copyright 2007 Krzysztof Kowalczyk <kkowalczyk at gmail.com>
 // Copyright 2010 Hib Eris <hib at hiberis.nl>
 // Copyright 2011 Albert Astals cid <aacid at kde.org>
-// Copyright (C) 2014 Bogdan Cristea <cristeab at gmail.com>
+// Copyright 2014 Bogdan Cristea <cristeab at gmail.com>
+// Copyright 2014 Peter Breitenlohner <peb at mppmu.mpg.de>
 // Inspired by gtimer.c in glib, which is Copyright 2000 by the GLib Team
 //
 //========================================================================
@@ -27,7 +28,9 @@
 #endif
 
 #ifdef _WIN32
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include <windows.h>
 #endif
 
diff --git a/goo/gfile.h b/goo/gfile.h
index 264d7d9..1365a9c 100644
--- a/goo/gfile.h
+++ b/goo/gfile.h
@@ -21,6 +21,7 @@
 // Copyright (C) 2013 Adam Reichold <adamreichold at myopera.com>
 // Copyright (C) 2013 Adrian Johnson <ajohnson at redneon.com>
 // Copyright (C) 2014 Bogdan Cristea <cristeab at gmail.com>
+// Copyright (C) 2014 Peter Breitenlohner <peb at mppmu.mpg.de>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
@@ -40,7 +41,9 @@ extern "C" {
 #  ifdef FPTEX
 #    include <win32lib.h>
 #  else
-  #define NOMINMAX
+#    ifndef NOMINMAX
+#      define NOMINMAX
+#    endif
 #    include <windows.h>
 #  endif
 #elif defined(ACORN)
diff --git a/poppler/XpdfPluginAPI.h b/poppler/XpdfPluginAPI.h
index db90dba..6ed890a 100644
--- a/poppler/XpdfPluginAPI.h
+++ b/poppler/XpdfPluginAPI.h
@@ -13,6 +13,7 @@
 //
 // Copyright (C) 2012 Albert Astals Cid <aacid at kde.org>
 // Copyright (C) 2014 Bogdan Cristea <cristeab at gmail.com>
+// Copyright (C) 2014 Peter Breitenlohner <peb at mppmu.mpg.de>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
@@ -23,7 +24,9 @@
 #define XPDFPLUGINAPI_H
 
 #ifdef _WIN32
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include <windows.h>
 #else
 #define Object XtObject