diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2017-05-19 17:27:48 +0900 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-05-22 22:00:47 +0200 |
| commit | f060adefba5f67ec20d755cf1d95d49b62686ee5 (patch) | |
| tree | 60750f62584b121b78d25fbb95cbc7cd462fb041 | |
| parent | c31bed5cd54e3db5a22d15d794d326ce9cafe146 (diff) | |
Test _WIN32 instead of WIN32
since the former is predefined by Visual C++ [0], but the latter
is not.
[0] https://msdn.microsoft.com/en-us/library/b0084kay.aspx
Change-Id: I9ecb84779cbaf5f0186ef0b05da61b32293f8f2b
Reviewed-on: https://gerrit.libreoffice.org/37808
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | basic/qa/cppunit/test_vba.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/remotecontrol/BluetoothServer.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/appl/shutdownicon.cxx | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx index 8b46d739f81d..ddd640d371d4 100644 --- a/basic/qa/cppunit/test_vba.cxx +++ b/basic/qa/cppunit/test_vba.cxx @@ -10,7 +10,7 @@ #include <comphelper/processfactory.hxx> #include <unotools/syslocaleoptions.hxx> -#ifdef WIN32 +#ifdef _WIN32 #include <string.h> #include <windows.h> diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx index bf68261e95e1..c5ad4e20d18c 100644 --- a/sd/source/ui/remotecontrol/BluetoothServer.cxx +++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx @@ -1307,7 +1307,7 @@ void SAL_CALL BluetoothServer::run() mpImpl->mpConnection = nullptr; mpImpl->mpContext = nullptr; -#elif defined(WIN32) +#elif defined(_WIN32) WORD wVersionRequested; WSADATA wsaData; diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index 09bb40aa1a9b..8d02091f5c45 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -81,7 +81,7 @@ using namespace ::com::sun::star::ui::dialogs; using namespace ::sfx2; #ifdef ENABLE_QUICKSTART_APPLET -# if !defined(WIN32) && !defined(MACOSX) +# if !defined(_WIN32) && !defined(MACOSX) extern "C" { static void SAL_CALL thisModule() {} } # endif #endif @@ -137,7 +137,7 @@ bool LoadModule() if (boost::logic::indeterminate(loaded)) { #ifdef ENABLE_QUICKSTART_APPLET -# ifdef WIN32 +# ifdef _WIN32 pInitSystray = win32_init_sys_tray; pDeInitSystray = win32_shutdown_sys_tray; loaded = true; |