[Libreoffice-commits] core.git: bridges/source codemaker/source connectivity/source cppuhelper/source cppu/source idlc/source include/osl include/rtl include/sal include/typelib include/uno io/test sal/rtl sax/test sccomp/source sc/source stoc/source sw/source testtools/source
Stephan Bergmann
sbergman at redhat.com
Fri Jan 19 07:20:04 UTC 2018
bridges/source/cpp_uno/shared/vtablefactory.cxx | 8 +++----
codemaker/source/codemaker/global.cxx | 2 -
codemaker/source/cppumaker/cpputype.cxx | 8 +++----
connectivity/source/drivers/postgresql/pq_connection.cxx | 2 -
cppu/source/typelib/static_types.cxx | 4 +--
cppu/source/typelib/typelib.cxx | 4 +--
cppu/source/uno/check.cxx | 4 +--
cppuhelper/source/access_control.cxx | 4 +--
idlc/source/idlccompile.cxx | 8 +++----
idlc/source/idlcproduce.cxx | 2 -
include/osl/module.h | 2 -
include/osl/process.h | 4 +--
include/osl/signal.h | 4 +--
include/osl/time.h | 4 +--
include/rtl/locale.h | 4 +--
include/rtl/string.h | 4 +--
include/rtl/ustring.h | 4 +--
include/sal/main.h | 6 ++---
include/sal/types.h | 6 ++---
include/typelib/typedescription.h | 4 +--
include/typelib/uik.h | 4 +--
include/uno/any2.h | 4 +--
include/uno/dispatcher.h | 4 +--
include/uno/environment.h | 4 +--
include/uno/mapping.h | 4 +--
io/test/testcomponent.cxx | 2 -
sal/rtl/alloc_arena.cxx | 16 +++++++--------
sal/rtl/alloc_cache.cxx | 14 ++++++-------
sal/rtl/alloc_impl.hxx | 4 +--
sax/test/testcomponent.cxx | 4 +--
sc/source/ui/inc/validate.hxx | 4 +--
sccomp/source/solver/LpsolveSolver.cxx | 2 -
stoc/source/implementationregistration/implreg.cxx | 2 -
stoc/source/security/permissions.cxx | 8 +++----
sw/source/filter/ww8/ww8struc.hxx | 4 +--
testtools/source/performance/ubtest.cxx | 4 +--
36 files changed, 86 insertions(+), 86 deletions(-)
New commits:
commit 697f01e052ae73e88d7e1a37386f2648d57e12e2
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Jan 18 16:39:59 2018 +0100
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 at libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
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
diff --git a/codemaker/source/codemaker/global.cxx b/codemaker/source/codemaker/global.cxx
index 512edab4fff7..daf031d7728d 100644
--- a/codemaker/source/codemaker/global.cxx
+++ b/codemaker/source/codemaker/global.cxx
@@ -26,7 +26,7 @@
#include <string.h>
#include <errno.h>
-#if defined(SAL_W32)
+#if defined(_WIN32)
# include <io.h>
# include <direct.h>
#endif
diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx
index ba84a46b75f4..22711d444126 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -1813,7 +1813,7 @@ private:
void PlainStructType::dumpDeclaration(FileStream & out)
{
- out << "\n#ifdef SAL_W32\n# pragma pack(push, 8)\n#endif\n\n" << indent();
+ out << "\n#ifdef _WIN32\n# pragma pack(push, 8)\n#endif\n\n" << indent();
out << "struct SAL_DLLPUBLIC_RTTI ";
if (canBeWarnUnused(name_))
out << "SAL_WARN_UNUSED ";
@@ -1856,7 +1856,7 @@ void PlainStructType::dumpDeclaration(FileStream & out)
}
}
dec();
- out << "};\n\n#ifdef SAL_W32\n# pragma pack(pop)\n#endif\n\n";
+ out << "};\n\n#ifdef _WIN32\n# pragma pack(pop)\n#endif\n\n";
}
void PlainStructType::dumpHppFile(
@@ -2212,7 +2212,7 @@ private:
void PolyStructType::dumpDeclaration(FileStream & out)
{
- out << "\n#ifdef SAL_W32\n# pragma pack(push, 8)\n#endif\n\n" << indent();
+ out << "\n#ifdef _WIN32\n# pragma pack(push, 8)\n#endif\n\n" << indent();
dumpTemplateHead(out);
out << "struct SAL_DLLPUBLIC_RTTI " << id_ << " {\n";
inc();
@@ -2248,7 +2248,7 @@ void PolyStructType::dumpDeclaration(FileStream & out)
}
}
dec();
- out << "};\n\n#ifdef SAL_W32\n# pragma pack(pop)\n#endif\n\n";
+ out << "};\n\n#ifdef _WIN32\n# pragma pack(pop)\n#endif\n\n";
}
void PolyStructType::dumpHppFile(
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx
index 6c5eb35ed5df..590f38752729 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -668,7 +668,7 @@ void log(ConnectionSettings *settings, LogLevel nLevel, const char *str)
time_t t = ::time( nullptr );
char *pString;
-#ifdef SAL_W32
+#ifdef _WIN32
pString = asctime( localtime( &t ) );
#else
struct tm timestruc;
diff --git a/cppu/source/typelib/static_types.cxx b/cppu/source/typelib/static_types.cxx
index 9b882afc6d22..eabd3950450f 100644
--- a/cppu/source/typelib/static_types.cxx
+++ b/cppu/source/typelib/static_types.cxx
@@ -42,7 +42,7 @@ extern "C"
{
-#ifdef SAL_W32
+#ifdef _WIN32
#pragma pack(push, 8)
#endif
@@ -65,7 +65,7 @@ struct AlignSize_Impl
#endif
};
-#ifdef SAL_W32
+#ifdef _WIN32
#pragma pack(pop)
#endif
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index bf44d6a850dc..8d842cc40a4f 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -47,7 +47,7 @@ using ::rtl::OUString;
using ::rtl::OUStringBuffer;
using ::rtl::OString;
-#ifdef SAL_W32
+#ifdef _WIN32
#pragma pack(push, 8)
#endif
@@ -70,7 +70,7 @@ struct AlignSize_Impl
#endif
};
-#ifdef SAL_W32
+#ifdef _WIN32
#pragma pack(pop)
#endif
diff --git a/cppu/source/uno/check.cxx b/cppu/source/uno/check.cxx
index 353e2c977493..e92d7616fa33 100644
--- a/cppu/source/uno/check.cxx
+++ b/cppu/source/uno/check.cxx
@@ -29,7 +29,7 @@
namespace {
-#if defined( SAL_W32)
+#if defined( _WIN32)
#pragma pack(push, 8)
#endif
@@ -143,7 +143,7 @@ enum Enum
v = SAL_MAX_ENUM
};
-#ifdef SAL_W32
+#ifdef _WIN32
# pragma pack(pop)
#endif
diff --git a/cppuhelper/source/access_control.cxx b/cppuhelper/source/access_control.cxx
index 2ed773596370..8bce8a23887b 100644
--- a/cppuhelper/source/access_control.cxx
+++ b/cppuhelper/source/access_control.cxx
@@ -71,7 +71,7 @@ AccessControl::AccessControl( AccessControl const & ac )
namespace {
-#ifdef SAL_W32
+#ifdef _WIN32
#pragma pack(push, 8)
#endif
// binary comp. to all Permission structs
@@ -80,7 +80,7 @@ namespace {
rtl_uString * m_str1;
rtl_uString * m_str2;
};
-#ifdef SAL_W32
+#ifdef _WIN32
#pragma pack(pop)
#endif
diff --git a/idlc/source/idlccompile.cxx b/idlc/source/idlccompile.cxx
index 84f026a1db89..c2a4e045aea6 100644
--- a/idlc/source/idlccompile.cxx
+++ b/idlc/source/idlccompile.cxx
@@ -25,7 +25,7 @@
#include <osl/thread.h>
#include <osl/file.hxx>
-#if defined(SAL_W32)
+#if defined(_WIN32)
#include <io.h>
#endif
@@ -122,7 +122,7 @@ OString makeTempName(const OString& prefix)
{
if ( osl_getEnvironment(OUString("TEMP").pData, &uTmpPath.pData) != osl_Process_E_None )
{
-#if defined(SAL_W32)
+#if defined(_WIN32)
tmpPath = OString("c:\\temp");
#else
tmpPath = OString("/tmp");
@@ -133,7 +133,7 @@ OString makeTempName(const OString& prefix)
if ( !uTmpPath.isEmpty() )
tmpPath = OUStringToOString(uTmpPath, RTL_TEXTENCODING_UTF8);
-#if defined(SAL_W32) || defined(SAL_UNX)
+#if defined(_WIN32) || defined(SAL_UNX)
OSL_ASSERT( sizeof(tmpFilePattern) >
static_cast<size_t>( tmpPath.getLength()
@@ -302,7 +302,7 @@ sal_Int32 compileFile(const OString * pathname)
sal_Int32 idx= cpp.lastIndexOf("idlc");
cpp = cpp.copy(0, idx);
-#if defined(SAL_W32)
+#if defined(_WIN32)
cpp += "ucpp.exe";
#else
cpp += "ucpp";
diff --git a/idlc/source/idlcproduce.cxx b/idlc/source/idlcproduce.cxx
index 2fa0a3b0317b..81e6f3abc9e7 100644
--- a/idlc/source/idlcproduce.cxx
+++ b/idlc/source/idlcproduce.cxx
@@ -23,7 +23,7 @@
#include <osl/file.hxx>
#include <osl/thread.h>
-#if defined(SAL_W32)
+#if defined(_WIN32)
#include <io.h>
#include <direct.h>
#include <errno.h>
diff --git a/include/osl/module.h b/include/osl/module.h
index 03c9a80d114a..76099a94ca6c 100644
--- a/include/osl/module.h
+++ b/include/osl/module.h
@@ -36,7 +36,7 @@ extern "C" {
#define SAL_MODULENAME(name) name SAL_DLLEXTENSION
#endif
-#if defined(SAL_W32)
+#if defined(_WIN32)
#define SAL_MODULENAME_WITH_VERSION(name, version) name version SAL_DLLEXTENSION
#elif defined(SAL_UNX)
diff --git a/include/osl/process.h b/include/osl/process.h
index 52aa8bd0f311..a2c1eed4193c 100644
--- a/include/osl/process.h
+++ b/include/osl/process.h
@@ -69,7 +69,7 @@ typedef enum {
osl_Process_E_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
} oslProcessError;
-#ifdef SAL_W32
+#ifdef _WIN32
# pragma pack(push, 8)
#endif
@@ -83,7 +83,7 @@ typedef struct {
sal_uInt32 HeapUsage;
} oslProcessInfo;
-#if defined( SAL_W32)
+#if defined( _WIN32)
# pragma pack(pop)
#endif
diff --git a/include/osl/signal.h b/include/osl/signal.h
index dd05b0a6889d..4b7beadc295a 100644
--- a/include/osl/signal.h
+++ b/include/osl/signal.h
@@ -58,7 +58,7 @@ typedef enum
osl_Signal_Act_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
} oslSignalAction;
-#ifdef SAL_W32
+#ifdef _WIN32
# pragma pack(push, 8)
#endif
@@ -69,7 +69,7 @@ typedef struct
void* UserData;
} oslSignalInfo;
-#if defined( SAL_W32)
+#if defined( _WIN32)
# pragma pack(pop)
#endif
diff --git a/include/osl/time.h b/include/osl/time.h
index 490fc9f3e36e..5dd8d9d8f342 100644
--- a/include/osl/time.h
+++ b/include/osl/time.h
@@ -29,7 +29,7 @@
#include "sal/saldllapi.h"
#include "sal/types.h"
-#ifdef SAL_W32
+#ifdef _WIN32
# pragma pack(push, 8)
#endif
@@ -74,7 +74,7 @@ typedef struct {
#endif
-#if defined(SAL_W32)
+#if defined(_WIN32)
# pragma pack(pop)
#endif
diff --git a/include/rtl/locale.h b/include/rtl/locale.h
index 127a81b87c4c..c8b80b4e9646 100644
--- a/include/rtl/locale.h
+++ b/include/rtl/locale.h
@@ -29,7 +29,7 @@
extern "C" {
#endif
-#ifdef SAL_W32
+#ifdef _WIN32
# pragma pack(push, 8)
#endif
@@ -59,7 +59,7 @@ typedef struct _rtl_Locale
sal_Int32 HashCode;
} rtl_Locale;
-#if defined( SAL_W32)
+#if defined( _WIN32)
#pragma pack(pop)
#endif
diff --git a/include/rtl/string.h b/include/rtl/string.h
index 1aa11fd06a88..ecf4704b0999 100644
--- a/include/rtl/string.h
+++ b/include/rtl/string.h
@@ -836,7 +836,7 @@ SAL_DLLPUBLIC double SAL_CALL rtl_str_toDouble(
/* ======================================================================= */
-#ifdef SAL_W32
+#ifdef _WIN32
# pragma pack(push, 8)
#endif
@@ -851,7 +851,7 @@ typedef struct _rtl_String
} rtl_String;
/** @endcond */
-#if defined(SAL_W32)
+#if defined(_WIN32)
#pragma pack(pop)
#endif
diff --git a/include/rtl/ustring.h b/include/rtl/ustring.h
index 911cc033a721..e46e646c9c71 100644
--- a/include/rtl/ustring.h
+++ b/include/rtl/ustring.h
@@ -1166,7 +1166,7 @@ SAL_DLLPUBLIC double SAL_CALL rtl_ustr_toDouble(
/* ======================================================================= */
-#if defined(SAL_W32)
+#if defined(_WIN32)
#pragma pack(push, 4)
#endif
@@ -1181,7 +1181,7 @@ typedef struct SAL_DLLPUBLIC_RTTI _rtl_uString
} rtl_uString;
/** @endcond */
-#if defined(SAL_W32)
+#if defined(_WIN32)
#pragma pack(pop)
#endif
diff --git a/include/sal/main.h b/include/sal/main.h
index 4519e8690cb1..9b5ba2b8d69b 100644
--- a/include/sal/main.h
+++ b/include/sal/main.h
@@ -67,7 +67,7 @@ int SAL_DLLPUBLIC_EXPORT SAL_CALL main(int argc, char ** argv) \
/* Definition macros for CRT entries */
-#ifdef SAL_W32
+#ifdef _WIN32
#include <stdlib.h>
@@ -99,11 +99,11 @@ int WINAPI WinMain( HINSTANCE _hinst, HINSTANCE _dummy, char* _cmdline, int _nsh
return main(argc, argv); \
}
-#else /* ! SAL_W32 */
+#else /* ! _WIN32 */
# define SAL_WIN_WinMain
-#endif /* ! SAL_W32 */
+#endif /* ! _WIN32 */
/* Implementation macro */
diff --git a/include/sal/types.h b/include/sal/types.h
index 49f7568a1978..5f6331709af3 100644
--- a/include/sal/types.h
+++ b/include/sal/types.h
@@ -135,7 +135,7 @@ typedef unsigned char sal_uChar;
#if defined LIBO_INTERNAL_ONLY && defined __cplusplus
#define SAL_UNICODE_NOTEQUAL_WCHAR_T
typedef char16_t sal_Unicode;
-#elif defined(SAL_W32)
+#elif defined(_WIN32)
typedef wchar_t sal_Unicode;
#else
#define SAL_UNICODE_NOTEQUAL_WCHAR_T
@@ -315,7 +315,7 @@ typedef void * sal_Handle;
# define SAL_NO_VTABLE
#endif
-#ifdef SAL_W32
+#ifdef _WIN32
# pragma pack(push, 8)
#endif
@@ -337,7 +337,7 @@ typedef struct _sal_Sequence
#define SAL_SEQUENCE_HEADER_SIZE ((sal_Size) offsetof(sal_Sequence,elements))
-#if defined( SAL_W32)
+#if defined( _WIN32)
#pragma pack(pop)
#endif
diff --git a/include/typelib/typedescription.h b/include/typelib/typedescription.h
index a6350b409b29..51b13af29d57 100644
--- a/include/typelib/typedescription.h
+++ b/include/typelib/typedescription.h
@@ -31,7 +31,7 @@ extern "C"
struct _typelib_TypeDescription;
-#if defined( SAL_W32)
+#if defined( _WIN32)
#pragma pack(push, 8)
#endif
@@ -477,7 +477,7 @@ typedef struct _typelib_Parameter_Init
sal_Bool bOut;
} typelib_Parameter_Init;
-#if defined( SAL_W32)
+#if defined( _WIN32)
#pragma pack(pop)
#endif
diff --git a/include/typelib/uik.h b/include/typelib/uik.h
index 4899e95161b2..4c077ffeba65 100644
--- a/include/typelib/uik.h
+++ b/include/typelib/uik.h
@@ -21,7 +21,7 @@
#include "sal/types.h"
-#if defined( SAL_W32)
+#if defined( _WIN32)
#pragma pack(push, 8)
#endif
@@ -38,7 +38,7 @@ typedef struct _typelib_Uik
sal_uInt32 m_Data5;
} typelib_Uik;
-#if defined( SAL_W32)
+#if defined( _WIN32)
# pragma pack(pop)
#endif
diff --git a/include/uno/any2.h b/include/uno/any2.h
index 29e10485a93c..4493d4c0af96 100644
--- a/include/uno/any2.h
+++ b/include/uno/any2.h
@@ -27,7 +27,7 @@ extern "C"
{
#endif
-#if defined( SAL_W32)
+#if defined( _WIN32)
#pragma pack(push, 8)
#endif
@@ -52,7 +52,7 @@ typedef struct SAL_DLLPUBLIC_RTTI _uno_Any
void * pReserved;
} uno_Any;
-#if defined( SAL_W32)
+#if defined( _WIN32)
#pragma pack(pop)
#endif
diff --git a/include/uno/dispatcher.h b/include/uno/dispatcher.h
index 44b319a04b6f..f9d1fbc31bf1 100644
--- a/include/uno/dispatcher.h
+++ b/include/uno/dispatcher.h
@@ -52,7 +52,7 @@ typedef void (SAL_CALL * uno_DispatchMethod)(
void * pArgs[],
uno_Any ** ppException );
-#if defined( SAL_W32)
+#if defined( _WIN32)
#pragma pack(push, 8)
#endif
@@ -75,7 +75,7 @@ typedef struct SAL_DLLPUBLIC_RTTI _uno_Interface
uno_DispatchMethod pDispatcher;
} uno_Interface;
-#if defined( SAL_W32)
+#if defined( _WIN32)
#pragma pack(pop)
#endif
diff --git a/include/uno/environment.h b/include/uno/environment.h
index 8874d1680e03..b68a0c5041c0 100644
--- a/include/uno/environment.h
+++ b/include/uno/environment.h
@@ -32,7 +32,7 @@ extern "C"
struct _uno_ExtEnvironment;
struct _typelib_InterfaceTypeDescription;
-#if defined( SAL_W32)
+#if defined( _WIN32)
#pragma pack(push, 8)
#endif
@@ -245,7 +245,7 @@ typedef struct SAL_DLLPUBLIC_RTTI _uno_ExtEnvironment
} uno_ExtEnvironment;
-#if defined( SAL_W32)
+#if defined( _WIN32)
#pragma pack(pop)
#endif
diff --git a/include/uno/mapping.h b/include/uno/mapping.h
index c1fae966ee30..cb24839eba1b 100644
--- a/include/uno/mapping.h
+++ b/include/uno/mapping.h
@@ -55,7 +55,7 @@ typedef void (SAL_CALL * uno_MapInterfaceFunc)(
struct _typelib_InterfaceTypeDescription * pInterfaceTypeDescr );
-#if defined( SAL_W32)
+#if defined( _WIN32)
#pragma pack(push, 8)
#endif
@@ -76,7 +76,7 @@ typedef struct SAL_DLLPUBLIC_RTTI _uno_Mapping
uno_MapInterfaceFunc mapInterface;
} uno_Mapping;
-#if defined( SAL_W32)
+#if defined( _WIN32)
#pragma pack(pop)
#endif
diff --git a/io/test/testcomponent.cxx b/io/test/testcomponent.cxx
index fd1e3d7e5e31..738f47d4f54c 100644
--- a/io/test/testcomponent.cxx
+++ b/io/test/testcomponent.cxx
@@ -94,7 +94,7 @@ int main (int argc, char **argv)
sTestName = "test";
sTestName += argv[2];
-#if defined(SAL_W32)
+#if defined(_WIN32)
OUString aDllName = OStringToOUString( sTestName , RTL_TEXTENCODING_ASCII_US );
#else
OUString aDllName("lib");
diff --git a/sal/rtl/alloc_arena.cxx b/sal/rtl/alloc_arena.cxx
index ef8738fc170f..2d1d17c1378b 100644
--- a/sal/rtl/alloc_arena.cxx
+++ b/sal/rtl/alloc_arena.cxx
@@ -1020,9 +1020,9 @@ void rtl_arena_foreach (rtl_arena_type *arena, ArenaForeachFn foreachFn, void *u
#if defined(SAL_UNX)
#include <sys/mman.h>
-#elif defined(SAL_W32)
+#elif defined(_WIN32)
#define MAP_FAILED nullptr
-#endif /* SAL_UNX || SAL_W32 */
+#endif /* SAL_UNX || _WIN32 */
namespace
{
@@ -1061,9 +1061,9 @@ void * rtl_machdep_alloc(
#if defined(SAL_UNX)
addr = mmap (nullptr, static_cast<size_t>(size), PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0);
-#elif defined(SAL_W32)
+#elif defined(_WIN32)
addr = VirtualAlloc (nullptr, (SIZE_T)size, MEM_COMMIT, PAGE_READWRITE);
-#endif /* (SAL_UNX || SAL_W32) */
+#endif /* (SAL_UNX || _WIN32) */
if (addr != MAP_FAILED)
{
@@ -1091,9 +1091,9 @@ void rtl_machdep_free(
#if defined(SAL_UNX)
(void) munmap(pAddr, nSize);
-#elif defined(SAL_W32)
+#elif defined(_WIN32)
(void) VirtualFree (pAddr, (SIZE_T)0, MEM_RELEASE);
-#endif /* (SAL_UNX || SAL_W32) */
+#endif /* (SAL_UNX || _WIN32) */
}
sal_Size rtl_machdep_pagesize()
@@ -1104,11 +1104,11 @@ sal_Size rtl_machdep_pagesize()
#else /* POSIX */
return static_cast<sal_Size>(sysconf(_SC_PAGESIZE));
#endif /* xBSD || POSIX */
-#elif defined(SAL_W32)
+#elif defined(_WIN32)
SYSTEM_INFO info;
GetSystemInfo (&info);
return (sal_Size)info.dwPageSize;
-#endif /* (SAL_UNX || SAL_W32) */
+#endif /* (SAL_UNX || _WIN32) */
}
} //namespace
diff --git a/sal/rtl/alloc_cache.cxx b/sal/rtl/alloc_cache.cxx
index d9aeb7edcc77..a753b2060d20 100644
--- a/sal/rtl/alloc_cache.cxx
+++ b/sal/rtl/alloc_cache.cxx
@@ -44,10 +44,10 @@ struct rtl_cache_list_st
#if defined(SAL_UNX)
pthread_t m_update_thread;
pthread_cond_t m_update_cond;
-#elif defined(SAL_W32)
+#elif defined(_WIN32)
HANDLE m_update_thread;
HANDLE m_update_cond;
-#endif /* SAL_UNX || SAL_W32 */
+#endif /* SAL_UNX || _WIN32 */
int m_update_done;
};
@@ -1225,7 +1225,7 @@ static void rtl_cache_wsupdate_fini()
pthread_join (g_cache_list.m_update_thread, nullptr);
}
-#elif defined(SAL_W32)
+#elif defined(_WIN32)
void SAL_CALL rtl_secureZeroMemory(void *Ptr, sal_Size Bytes) SAL_THROW_EXTERN_C()
{
@@ -1267,7 +1267,7 @@ static void rtl_cache_wsupdate_fini()
WaitForSingleObject (g_cache_list.m_update_thread, INFINITE);
}
-#endif /* SAL_UNX || SAL_W32 */
+#endif /* SAL_UNX || _WIN32 */
/**
update depot stats and purge excess magazines.
@@ -1317,9 +1317,9 @@ static void rtl_cache_wsupdate(rtl_cache_type * cache)
#if defined(SAL_UNX)
static void *
-#elif defined(SAL_W32)
+#elif defined(_WIN32)
static DWORD WINAPI
-#endif /* SAL_UNX || SAL_W32 */
+#endif /* SAL_UNX || _WIN32 */
rtl_cache_wsupdate_all(void * arg)
{
osl::Thread::setName("rtl_cache_wsupdate_all");
@@ -1347,7 +1347,7 @@ rtl_cache_wsupdate_all(void * arg)
#if defined(SAL_UNX)
return nullptr;
-#elif defined(SAL_W32)
+#elif defined(_WIN32)
return 0;
#endif
}
diff --git a/sal/rtl/alloc_impl.hxx b/sal/rtl/alloc_impl.hxx
index bdf4e7b6eb81..bb46a544f7b0 100644
--- a/sal/rtl/alloc_impl.hxx
+++ b/sal/rtl/alloc_impl.hxx
@@ -190,7 +190,7 @@ typedef pthread_mutex_t rtl_memory_lock_type;
#define RTL_MEMORY_LOCK_ACQUIRE(lock) pthread_mutex_lock((lock))
#define RTL_MEMORY_LOCK_RELEASE(lock) pthread_mutex_unlock((lock))
-#elif defined(SAL_W32)
+#elif defined(_WIN32)
#define WIN32_LEAN_AND_MEAN
#ifdef _MSC_VER
@@ -211,7 +211,7 @@ typedef CRITICAL_SECTION rtl_memory_lock_type;
#else
#error Unknown platform
-#endif /* SAL_UNX | SAL_W32 */
+#endif /* SAL_UNX | _WIN32 */
/** Cache creation flags.
@internal
diff --git a/sax/test/testcomponent.cxx b/sax/test/testcomponent.cxx
index 83f9e224a53a..08a4b053cd89 100644
--- a/sax/test/testcomponent.cxx
+++ b/sax/test/testcomponent.cxx
@@ -83,7 +83,7 @@ int main (int argc, char **argv)
{
// Load dll for the tested component
for( int n = 2 ; n <argc ; n ++ ) {
-#ifdef SAL_W32
+#ifdef _WIN32
OUString aDllName = OStringToOUString( argv[n] , RTL_TEXTENCODING_ASCII_US );
#else
OUString aDllName = "lib";
@@ -111,7 +111,7 @@ int main (int argc, char **argv)
sTestName = "test";
sTestName += argv[2];
-#ifdef SAL_W32
+#ifdef _WIN32
OUString aDllName = OStringToOUString( sTestName , RTL_TEXTENCODING_ASCII_US );
#else
OUString aDllName = "lib";
diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx
index 03b0bb80f40b..4d67bd6ed0c0 100644
--- a/sc/source/ui/inc/validate.hxx
+++ b/sc/source/ui/inc/validate.hxx
@@ -38,14 +38,14 @@ class ScRefHandlerHelper
protected:
VclPtr<ScRefHandlerCaller> m_pHandler;
// workaround VS2013 issue with pointers to things that contain virtual base class
-#ifdef SAL_W32
+#ifdef _WIN32
#pragma pack(push, 16)
#endif
void (ScRefHandlerCaller::*m_pSetReferenceHdl)( const ScRange& , const ScDocument* );
void (ScRefHandlerCaller::*m_pSetActiveHdl)();
void (ScRefHandlerCaller::*m_pRefInputStartPreHdl)( formula::RefEdit* pEdit, const formula::RefButton* pButton );
void (ScRefHandlerCaller::*m_pRefInputDonePostHdl)();
-#if defined( SAL_W32)
+#if defined( _WIN32)
#pragma pack(pop)
#endif
diff --git a/sccomp/source/solver/LpsolveSolver.cxx b/sccomp/source/solver/LpsolveSolver.cxx
index 6ae23d261e10..8a6d32856760 100644
--- a/sccomp/source/solver/LpsolveSolver.cxx
+++ b/sccomp/source/solver/LpsolveSolver.cxx
@@ -40,7 +40,7 @@
#include <config_lgpl.h>
#undef LANGUAGE_NONE
-#if defined SAL_W32
+#if defined _WIN32
#define WINAPI __stdcall
#endif
#define LoadInverseLib FALSE
diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx
index a4a7f0beeca6..fd24918dd06d 100644
--- a/stoc/source/implementationregistration/implreg.cxx
+++ b/stoc/source/implementationregistration/implreg.cxx
@@ -47,7 +47,7 @@
#include "mergekeys.hxx"
-#if defined(SAL_W32)
+#if defined(_WIN32)
#include <io.h>
#else
#include <unistd.h>
diff --git a/stoc/source/security/permissions.cxx b/stoc/source/security/permissions.cxx
index 2854cf1319d1..f996df36bd15 100644
--- a/stoc/source/security/permissions.cxx
+++ b/stoc/source/security/permissions.cxx
@@ -332,7 +332,7 @@ FilePermission::FilePermission(
getWorkingDir().pData, perm.URL.pData, &out.pData );
m_url = (osl_File_E_None == rc ? out : perm.URL); // fallback
}
-#ifdef SAL_W32
+#ifdef _WIN32
// correct win drive letters
if (9 < m_url.getLength() && '|' == m_url[ 9 ]) // file:///X|
{
@@ -361,7 +361,7 @@ bool FilePermission::implies( Permission const & perm ) const
if (demanded.m_allFiles)
return false;
-#ifdef SAL_W32
+#ifdef _WIN32
if (m_url.equalsIgnoreAsciiCase( demanded.m_url ))
return true;
#else
@@ -375,7 +375,7 @@ bool FilePermission::implies( Permission const & perm ) const
{
// demanded url must start with granted path (including path trailing path sep)
sal_Int32 len = m_url.getLength() -1;
-#ifdef SAL_W32
+#ifdef _WIN32
return (0 == ::rtl_ustr_compareIgnoreAsciiCase_WithLength(
demanded.m_url.pData->buffer, len, m_url.pData->buffer, len ));
#else
@@ -388,7 +388,7 @@ bool FilePermission::implies( Permission const & perm ) const
{
// demanded url must start with granted path (including path trailing path sep)
sal_Int32 len = m_url.getLength() -1;
-#ifdef SAL_W32
+#ifdef _WIN32
return ((0 == ::rtl_ustr_compareIgnoreAsciiCase_WithLength(
demanded.m_url.pData->buffer, len, m_url.pData->buffer, len )) &&
(0 > demanded.m_url.indexOf( '/', len ))); // in addition, no deeper paths
diff --git a/sw/source/filter/ww8/ww8struc.hxx b/sw/source/filter/ww8/ww8struc.hxx
index bcf4311491c0..00d56263c9a5 100644
--- a/sw/source/filter/ww8/ww8struc.hxx
+++ b/sw/source/filter/ww8/ww8struc.hxx
@@ -28,7 +28,7 @@
#include <editeng/borderline.hxx>
#include <filter/msfilter/util.hxx>
-#ifdef SAL_W32
+#ifdef _WIN32
# pragma pack(push, 2)
#endif
@@ -987,7 +987,7 @@ struct WW8_WKB
SVBT16 reserved5;
};
-#ifdef SAL_W32
+#ifdef _WIN32
# pragma pack(pop)
#endif
diff --git a/testtools/source/performance/ubtest.cxx b/testtools/source/performance/ubtest.cxx
index 88592ad77990..89643574198e 100644
--- a/testtools/source/performance/ubtest.cxx
+++ b/testtools/source/performance/ubtest.cxx
@@ -32,7 +32,7 @@
#include <osl/conditn.hxx>
#include <osl/time.h>
-#ifdef SAL_W32
+#ifdef _WIN32
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
@@ -84,7 +84,7 @@ namespace benchmark_test
static inline sal_uInt32 getSystemTicks()
{
-#ifdef SAL_W32
+#ifdef _WIN32
return (sal_uInt32)GetTickCount();
#else // only UNX supported for now
static sal_uInt32 nImplTicksPerSecond = 0;
More information about the Libreoffice-commits
mailing list