diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-01-18 16:39:59 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-01-19 08:19:38 +0100 |
| commit | 697f01e052ae73e88d7e1a37386f2648d57e12e2 (patch) | |
| tree | 6dc879a6307ad905b909e0eb88bb143899806279 /bridges | |
| parent | 161af2120f41f34fe562f677907ccfba41f7012a (diff) | |
SAL_W32 is just an alias for _WIN32
...so consistently use the latter instead of the former
Change-Id: I144d5e7c472632f93b2258461510346bc85892d9
Reviewed-on: https://gerrit.libreoffice.org/48135
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/source/cpp_uno/shared/vtablefactory.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx b/bridges/source/cpp_uno/shared/vtablefactory.cxx index 50419298d87f..56669a258680 100644 --- a/bridges/source/cpp_uno/shared/vtablefactory.cxx +++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx @@ -43,7 +43,7 @@ #include <string.h> #include <errno.h> #include <sys/mman.h> -#elif defined SAL_W32 +#elif defined _WIN32 #define WIN32_LEAN_AND_MEAN #ifdef _MSC_VER #pragma warning(push,1) // disable warnings within system headers @@ -74,7 +74,7 @@ extern "C" void * allocExec( #else pagesize = sysconf(_SC_PAGESIZE); #endif -#elif defined SAL_W32 +#elif defined _WIN32 SYSTEM_INFO info; GetSystemInfo(&info); pagesize = info.dwPageSize; @@ -95,7 +95,7 @@ extern "C" void * allocExec( munmap (p, n); p = nullptr; } -#elif defined SAL_W32 +#elif defined _WIN32 p = VirtualAlloc(nullptr, n, MEM_COMMIT, PAGE_EXECUTE_READWRITE); #endif if (p != nullptr) { @@ -109,7 +109,7 @@ extern "C" void freeExec( { #if defined SAL_UNX munmap(address, size); -#elif defined SAL_W32 +#elif defined _WIN32 (void) size; // unused VirtualFree(address, 0, MEM_RELEASE); #endif |