-Werror=unused-macros (MinGW, vcl)
Change-Id: I2a3b5ad429e7bcc60dc50635a48feb6037b0001e
This commit is contained in:
parent
598215cb41
commit
a43afd19c9
3 changed files with 1 additions and 15 deletions
|
@ -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 )
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue