diff options
| author | Noel Grandin <noel@peralex.com> | 2016-02-16 14:14:43 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-02-17 11:33:57 +0000 |
| commit | 2087484c65a3d5e75a9e8ad116d11a4e13366219 (patch) | |
| tree | 1f335918a854319df9269329d165a91d711d2108 /vcl/qa | |
| parent | d6bf086012343b4a1e27cd4242dced9ee0d73a06 (diff) | |
use consistent #define checks for the Windows platform
stage 2 of replacing usage of various checks for the windows platform
with the compiler-defined '_WIN32' macro
In this stage we focus on replacing usage of the WIN macro
Change-Id: Ie8a4a63198a6de96bd158ecd707dadafb9c8ea84
Reviewed-on: https://gerrit.libreoffice.org/22393
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl/qa')
| -rw-r--r-- | vcl/qa/cppunit/BitmapTest.cxx | 2 | ||||
| -rw-r--r-- | vcl/qa/cppunit/complextext.cxx | 6 | ||||
| -rw-r--r-- | vcl/qa/cppunit/timer.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/vcl/qa/cppunit/BitmapTest.cxx b/vcl/qa/cppunit/BitmapTest.cxx index 7455b4b2bdf2..4336e6bb7e87 100644 --- a/vcl/qa/cppunit/BitmapTest.cxx +++ b/vcl/qa/cppunit/BitmapTest.cxx @@ -76,7 +76,7 @@ void BitmapTest::testConvert() CPPUNIT_ASSERT_EQUAL(sal_uLong(40), pReadAccess->GetScanlineSize()); #else CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt16>(24), pReadAccess->GetBitCount()); -#if defined WNT +#if defined(_WIN32) if (!OpenGLHelper::isVCLOpenGLEnabled()) { // GDI Scanlines padded to DWORD multiples, it seems diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx index 31717ccdd12e..b0fa4d72cb80 100644 --- a/vcl/qa/cppunit/complextext.cxx +++ b/vcl/qa/cppunit/complextext.cxx @@ -22,13 +22,13 @@ public: /// Play with font measuring etc. void testArabic(); -#if defined(WNT) +#if defined(_WIN32) void testTdf95650(); // Windows-only issue #endif CPPUNIT_TEST_SUITE(VclComplexTextTest); CPPUNIT_TEST(testArabic); -#if defined(WNT) +#if defined(_WIN32) CPPUNIT_TEST(testTdf95650); #endif CPPUNIT_TEST_SUITE_END(); @@ -83,7 +83,7 @@ void VclComplexTextTest::testArabic() #endif } -#if defined(WNT) +#if defined(_WIN32) void VclComplexTextTest::testTdf95650() { const sal_Unicode pTxt[] = { diff --git a/vcl/qa/cppunit/timer.cxx b/vcl/qa/cppunit/timer.cxx index 22fa582114c5..0d3afa1ace8d 100644 --- a/vcl/qa/cppunit/timer.cxx +++ b/vcl/qa/cppunit/timer.cxx @@ -127,7 +127,7 @@ void TimerTest::testIdle() // tdf#91727 void TimerTest::testIdleMainloop() { -#ifndef WNT +#ifndef _WIN32 bool bTriggered = false; IdleBool aTest( bTriggered ); // coverity[loop_top] - Application::Yield allows the timer to fire and toggle bDone |