diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-03-30 23:34:23 +0200 |
|---|---|---|
| committer | Albert Astals Cid <aacid@kde.org> | 2014-03-30 23:35:12 +0200 |
| commit | 8d3a2c9d007052bcb8719200760a1abb6314f804 (patch) | |
| tree | 4551e41aae0c2b21a6f9df9f53fef4a1c068c042 | |
| parent | 38dcaf96f308265ff6958e4683bcec2be0c254b9 (diff) | |
Avoid MinGW/Cygwin warnings due to redefinition of NOMINMAX
| -rw-r--r-- | goo/GooMutex.h | 3 | ||||
| -rw-r--r-- | goo/GooTimer.h | 5 | ||||
| -rw-r--r-- | goo/gfile.h | 5 | ||||
| -rw-r--r-- | poppler/XpdfPluginAPI.h | 3 |
4 files changed, 14 insertions, 2 deletions
diff --git a/goo/GooMutex.h b/goo/GooMutex.h index 4a7ed5f1..b2714b04 100644 --- a/goo/GooMutex.h +++ b/goo/GooMutex.h @@ -20,6 +20,7 @@ // Copyright (C) 2013 Albert Astals Cid <aacid@kde.org> // Copyright (C) 2013 Adam Reichold <adamreichold@myopera.com> // Copyright (C) 2014 Bogdan Cristea <cristeab@gmail.com> +// Copyright (C) 2014 Peter Breitenlohner <peb@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 7bbe9f01..ac64f6b4 100644 --- a/goo/GooTimer.h +++ b/goo/GooTimer.h @@ -8,7 +8,8 @@ // Copyright 2007 Krzysztof Kowalczyk <kkowalczyk@gmail.com> // Copyright 2010 Hib Eris <hib@hiberis.nl> // Copyright 2011 Albert Astals cid <aacid@kde.org> -// Copyright (C) 2014 Bogdan Cristea <cristeab@gmail.com> +// Copyright 2014 Bogdan Cristea <cristeab@gmail.com> +// Copyright 2014 Peter Breitenlohner <peb@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 264d7d97..1365a9cf 100644 --- a/goo/gfile.h +++ b/goo/gfile.h @@ -21,6 +21,7 @@ // Copyright (C) 2013 Adam Reichold <adamreichold@myopera.com> // Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com> // Copyright (C) 2014 Bogdan Cristea <cristeab@gmail.com> +// Copyright (C) 2014 Peter Breitenlohner <peb@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 db90dbad..6ed890a8 100644 --- a/poppler/XpdfPluginAPI.h +++ b/poppler/XpdfPluginAPI.h @@ -13,6 +13,7 @@ // // Copyright (C) 2012 Albert Astals Cid <aacid@kde.org> // Copyright (C) 2014 Bogdan Cristea <cristeab@gmail.com> +// Copyright (C) 2014 Peter Breitenlohner <peb@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 |