diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-04-17 10:34:19 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-04-17 11:51:12 +0200 |
| commit | a43afd19c9405b629d30db6713e4115209f68f11 (patch) | |
| tree | 51f4609ac50606bda84d48080034fb0bd00a45be | |
| parent | 598215cb415ecc75df095bd83e427134d7409139 (diff) | |
-Werror=unused-macros (MinGW, vcl)
Change-Id: I2a3b5ad429e7bcc60dc50635a48feb6037b0001e
| -rw-r--r-- | vcl/win/source/app/salinst.cxx | 7 | ||||
| -rw-r--r-- | vcl/win/source/gdi/salgdi_gdiplus.cxx | 7 | ||||
| -rw-r--r-- | vcl/win/source/window/salframe.cxx | 2 |
3 files changed, 1 insertions, 15 deletions
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx index 26e75a0bba54..40edba10c234 100644 --- a/vcl/win/source/app/salinst.cxx +++ b/vcl/win/source/app/salinst.cxx @@ -43,13 +43,6 @@ #include <salimestatus.hxx> #include <salsys.hxx> -#ifndef min -#define min(a,b) (((a) < (b)) ? (a) : (b)) -#endif -#ifndef max -#define max(a,b) (((a) > (b)) ? (a) : (b)) -#endif - #if defined _MSC_VER #pragma warning(push, 1) #pragma warning( disable: 4917 ) diff --git a/vcl/win/source/gdi/salgdi_gdiplus.cxx b/vcl/win/source/gdi/salgdi_gdiplus.cxx index a6aa5ce7ae9d..f26ccaa4e840 100644 --- a/vcl/win/source/gdi/salgdi_gdiplus.cxx +++ b/vcl/win/source/gdi/salgdi_gdiplus.cxx @@ -26,13 +26,6 @@ #include <win/saldata.hxx> #include <win/salgdi.h> -#ifndef min -#define min(a,b) (((a) < (b)) ? (a) : (b)) -#endif -#ifndef max -#define max(a,b) (((a) > (b)) ? (a) : (b)) -#endif - #if defined _MSC_VER #pragma warning(push, 1) #endif diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index 145cabec1ac5..ce35e02f03d6 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -119,7 +119,7 @@ sal_Bool WinSalFrame::mbInReparent = FALSE; // ======================================================================= // Macros for support of WM_UNICHAR & Keyman 6.0 -#define Uni_UTF32ToSurrogate1(ch) (((unsigned long) (ch) - 0x10000) / 0x400 + 0xD800) +//#define Uni_UTF32ToSurrogate1(ch) (((unsigned long) (ch) - 0x10000) / 0x400 + 0xD800) #define Uni_UTF32ToSurrogate2(ch) (((unsigned long) (ch) - 0x10000) % 0x400 + 0xDC00) #define Uni_SupplementaryPlanesStart 0x10000 |