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 /sal/workben | |
| 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 'sal/workben')
| -rw-r--r-- | sal/workben/t_ojp_exe.cxx | 4 | ||||
| -rw-r--r-- | sal/workben/t_osl_getVolInfo.cxx | 2 | ||||
| -rw-r--r-- | sal/workben/t_osl_joinProcess.cxx | 2 | ||||
| -rw-r--r-- | sal/workben/testfile.cxx | 8 | ||||
| -rw-r--r-- | sal/workben/testproc.cxx | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/sal/workben/t_ojp_exe.cxx b/sal/workben/t_ojp_exe.cxx index 558ff3e722a1..8cd71267cdeb 100644 --- a/sal/workben/t_ojp_exe.cxx +++ b/sal/workben/t_ojp_exe.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifdef WNT +#ifdef _WIN32 # define WIN32_LEAN_AND_MEAN # include <windows.h> #else @@ -30,7 +30,7 @@ int main(int argc, char* argv[]) { printf("osl process test executable started:\n"); -#ifdef WNT +#ifdef _WIN32 Sleep(5000); #else sleep(5); diff --git a/sal/workben/t_osl_getVolInfo.cxx b/sal/workben/t_osl_getVolInfo.cxx index 74e6e87f3ffc..abb1cb5c1758 100644 --- a/sal/workben/t_osl_getVolInfo.cxx +++ b/sal/workben/t_osl_getVolInfo.cxx @@ -22,7 +22,7 @@ #include <osl/file.h> #include <rtl/ustring.hxx> -#ifdef WNT +#ifdef _WIN32 # define TEST_PATH_1 "c:\\" # define TEST_PATH_2 "c:\\mnt\\MSDN" # define TEST_PATH_3 "c:\\Program Files" diff --git a/sal/workben/t_osl_joinProcess.cxx b/sal/workben/t_osl_joinProcess.cxx index d043c5e343b3..08fd6c543608 100644 --- a/sal/workben/t_osl_joinProcess.cxx +++ b/sal/workben/t_osl_joinProcess.cxx @@ -24,7 +24,7 @@ #include <unistd.h> #include <signal.h> -#ifdef WNT +#ifdef _WIN32 const rtl::OUString IMAGE_NAME("ojpx.exe"); #else const rtl::OUString IMAGE_NAME("ojpx"); diff --git a/sal/workben/testfile.cxx b/sal/workben/testfile.cxx index dd9448bce907..3b3590f3bbce 100644 --- a/sal/workben/testfile.cxx +++ b/sal/workben/testfile.cxx @@ -32,7 +32,7 @@ #include <wchar.h> #endif -#ifdef WNT +#ifdef _WIN32 #include <windows.h> #endif @@ -1248,7 +1248,7 @@ void FileAttributesTest() } #endif -#ifdef WNT +#ifdef _WIN32 void FileAttributesTest() { FileBase::RC rc; @@ -1385,7 +1385,7 @@ void FileTimeTest() // GetCreationTime aCreationTimeRead=rStatus.getCreationTime(); -#ifdef WNT +#ifdef _WIN32 if ( aCreationTime.Seconds == aCreationTimeRead.Seconds && aCreationTime.Nanosec == aCreationTimeRead.Nanosec ) printf( "GetCreationTime: ok : " ); else @@ -2447,7 +2447,7 @@ void print_error( const ::rtl::OString& str, FileBase::RC rc ) // main -#if defined WNT +#if defined(_WIN32) #define MAIN _cdecl main #else #define MAIN main diff --git a/sal/workben/testproc.cxx b/sal/workben/testproc.cxx index 3d2bd79322bf..91d0e60fe5f8 100644 --- a/sal/workben/testproc.cxx +++ b/sal/workben/testproc.cxx @@ -20,7 +20,7 @@ #include <osl/process.h> #include <stdio.h> -#if defined WNT +#if defined(_WIN32) #define MAIN _cdecl main #else #define MAIN main |