diff options
| author | Noel Grandin <noel@peralex.com> | 2016-02-16 11:26:51 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-02-16 10:37:55 +0000 |
| commit | ce43d0ae9279edbf1ad108fe0d8325327a038d49 (patch) | |
| tree | a0fbf7bbd608d1185005a0de36496c6f3656e798 /vcl | |
| parent | 049cf885c6e6c12ac9fa20bcb4ca1472de5b9115 (diff) | |
use consistent #define checks for the Windows platform
stage 1 of replacing usage of various checks for the windows platform
with the compiler-defined '_WIN32' macro
Change-Id: Iece73abdee530937e0737190b1aa97a46cd3075f
Reviewed-on: https://gerrit.libreoffice.org/22390
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/salglyphid.hxx | 2 | ||||
| -rw-r--r-- | vcl/inc/sft.hxx | 2 | ||||
| -rw-r--r-- | vcl/opengl/win/WinDeviceInfo.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/fontsubset/sft.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/outdev/transparent.cxx | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/vcl/inc/salglyphid.hxx b/vcl/inc/salglyphid.hxx index 23ce1ce02104..c449e1bd4b47 100644 --- a/vcl/inc/salglyphid.hxx +++ b/vcl/inc/salglyphid.hxx @@ -29,7 +29,7 @@ typedef sal_uInt32 sal_GlyphId; #define GF_ISCHAR 0x00800000 #define GF_ROTL 0x01000000 -#ifdef WIN32 +#ifdef _WIN32 // caution !!! #define GF_VERT 0x02000000 // GF_VERT is only for windows implementation diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx index e346d83ad3fc..c7f6630bb993 100644 --- a/vcl/inc/sft.hxx +++ b/vcl/inc/sft.hxx @@ -252,7 +252,7 @@ namespace vcl * @ingroup sft */ int VCL_DLLPUBLIC OpenTTFontBuffer(const void* pBuffer, sal_uInt32 nLen, sal_uInt32 facenum, TrueTypeFont** ttf); -#if !defined(WIN32) +#if !defined(_WIN32) /** * TrueTypeFont constructor. * Reads the font file and allocates the memory for the structure. diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/opengl/win/WinDeviceInfo.cxx index 729368a4b05e..161d29a9cd1a 100644 --- a/vcl/opengl/win/WinDeviceInfo.cxx +++ b/vcl/opengl/win/WinDeviceInfo.cxx @@ -345,7 +345,7 @@ bool ParseDriverVersion(const OUString& aVersion, uint64_t& rNumericVersion) { rNumericVersion = 0; -#if defined(WIN32) +#if defined(_WIN32) int a, b, c, d; char aStr[8], bStr[8], cStr[8], dStr[8]; /* honestly, why do I even bother */ diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx index 608e7dbb0280..3a6921e9c5cd 100644 --- a/vcl/source/fontsubset/sft.cxx +++ b/vcl/source/fontsubset/sft.cxx @@ -1474,7 +1474,7 @@ static void allocTrueTypeFont( TrueTypeFont** ttf ) /* forward declaration for the two entry points to use*/ static int doOpenTTFont( sal_uInt32 facenum, TrueTypeFont* t ); -#if !defined(WIN32) +#if !defined(_WIN32) int OpenTTFontFile( const char* fname, sal_uInt32 facenum, TrueTypeFont** ttf ) { int ret, fd = -1; @@ -1738,7 +1738,7 @@ static int doOpenTTFont( sal_uInt32 facenum, TrueTypeFont* t ) void CloseTTFont(TrueTypeFont *ttf) { -#if !defined(WIN32) +#if !defined(_WIN32) if( ttf->fname ) munmap(ttf->ptr, ttf->fsize); #endif diff --git a/vcl/source/outdev/transparent.cxx b/vcl/source/outdev/transparent.cxx index 040c717bfa6f..6eed4c24c162 100644 --- a/vcl/source/outdev/transparent.cxx +++ b/vcl/source/outdev/transparent.cxx @@ -303,7 +303,7 @@ bool OutputDevice::DrawTransparentNatively ( const tools::PolyPolygon& rPolyPoly #if defined UNX && ! defined MACOSX && ! defined IOS && GetBitCount() > 8 #endif -#ifdef WIN32 +#ifdef _WIN32 // workaround bad dithering on remote displaying when using GDI+ with toolbar button highlighting && !rPolyPoly.IsRect() #endif |