-Werror=unused-macros (MinGW, sal)

Change-Id: I7c0411320798721e70de32580de6adcf5565f12a

8 files changed, 2 insertions, 23 deletions

diff --git a/sal/cpprt/operators_new_delete.cxx b/sal/cpprt/operators_new_delete.cxx
index 1943d52c1dad..2b53ffac6119 100644
--- a/sal/cpprt/operators_new_delete.cxx
+++ b/sal/cpprt/operators_new_delete.cxx
@@ -18,10 +18,10 @@
  */
 
 
-#ifdef WNT /* avoid 'std::bad_alloc' unresolved externals */
+#ifdef _MSC_VER /* avoid 'std::bad_alloc' unresolved externals */
 #define _CRTIMP
 #define _NTSDK
-#endif /* WNT */
+#endif
 
 #include <algorithm>
 #include <new>
diff --git a/sal/osl/w32/file.cxx b/sal/osl/w32/file.cxx
index 7e4f326562d2..87411d83d411 100644
--- a/sal/osl/w32/file.cxx
+++ b/sal/osl/w32/file.cxx
@@ -1139,9 +1139,6 @@ oslFileError SAL_CALL osl_removeFile( rtl_uString* strPath )
 }
 
 //#############################################
-#define osl_File_CopyRecursive  0x0001
-#define osl_File_CopyOverwrite  0x0002
-
 oslFileError SAL_CALL osl_copyFile( rtl_uString* strPath, rtl_uString *strDestPath )
 {
     rtl_uString *strSysPath = NULL, *strSysDestPath = NULL;
diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx
index 5d8c3a5bcbee..f3c97ecd26ab 100644
--- a/sal/osl/w32/file_dirvol.cxx
+++ b/sal/osl/w32/file_dirvol.cxx
@@ -274,7 +274,6 @@ struct DirectoryItem_Impl
 
 #define DIRECTORYTYPE_LOCALROOT     0
 #define DIRECTORYTYPE_NETROOT       1
-#define DIRECTORYTYPE_NETRESORCE    2
 #define DIRECTORYTYPE_FILESYSTEM    3
 
 struct Directory_Impl
diff --git a/sal/osl/w32/file_url.cxx b/sal/osl/w32/file_url.cxx
index 17883641958b..fb1fa459a61f 100644
--- a/sal/osl/w32/file_url.cxx
+++ b/sal/osl/w32/file_url.cxx
@@ -533,8 +533,6 @@ static DWORD GetCaseCorrectPathNameEx(
 }
 
 //#####################################################
-#define WSTR_SYSTEM_ROOT_PATH               L"\\\\.\\"
-
 DWORD GetCaseCorrectPathName(
     LPCTSTR lpszShortPath,  // file name
     LPTSTR  lpszLongPath,   // path buffer
diff --git a/sal/osl/w32/profile.cxx b/sal/osl/w32/profile.cxx
index dd95669b2e62..f588c837a0fe 100644
--- a/sal/osl/w32/profile.cxx
+++ b/sal/osl/w32/profile.cxx
@@ -69,12 +69,6 @@ static inline void copy_ustr_n( void *dest, const void *source, size_t length )
 #define SVERSION_DIRS       { "bin", "program" }
 #define SVERSION_USER       "user"
 
-#define DEFAULT_PMODE   (_S_IREAD | _S_IWRITE)
-
-#define _BUILD_STR_(n)  # n
-#define BUILD_STR(n)    _BUILD_STR_(n)
-
-
 /*#define DEBUG_OSL_PROFILE 1*/
 /*#define TRACE_OSL_PROFILE 1*/
 
diff --git a/sal/osl/w32/security.c b/sal/osl/w32/security.c
index 0e69541d4940..f72132e09a96 100644
--- a/sal/osl/w32/security.c
+++ b/sal/osl/w32/security.c
@@ -36,7 +36,6 @@
 /* Data for use in (un)LoadProfile Functions */
 /* Declarations based on USERENV.H for Windows 2000 Beta 2 */
 #define PI_NOUI         0x00000001   // Prevents displaying of messages
-#define PI_APPLYPOLICY  0x00000002   // Apply NT4 style policy
 
 typedef struct _PROFILEINFOW {
   DWORD    dwSize;          // Must be set to sizeof(PROFILEINFO)
diff --git a/sal/osl/w32/socket.cxx b/sal/osl/w32/socket.cxx
index c200a7b7476e..2b7e74202f5c 100644
--- a/sal/osl/w32/socket.cxx
+++ b/sal/osl/w32/socket.cxx
@@ -99,7 +99,6 @@ static DWORD ProtocolMap[]= {
 };
 
 /* macros */
-#define PROTOCOL_FROM_NATIVE(y) osl_ProtocolFromNative(y)
 #define PROTOCOL_TO_NATIVE(x)   ProtocolMap[x]
 
 /*****************************************************************************/
@@ -162,7 +161,6 @@ static DWORD OptionMap[]= {
 
 /* macros */
 #define OPTION_TO_NATIVE(x)     OptionMap[x]
-#define OPTION_FROM_NATIVE(y)   osl_SocketOptionFromNative(y)
 
 /*****************************************************************************/
 /* enum oslSocketOptionLevel */
@@ -176,7 +174,6 @@ static DWORD OptionLevelMap[]= {
 
 /* macros */
 #define OPTION_LEVEL_TO_NATIVE(x)       OptionLevelMap[x]
-#define OPTION_LEVEL_FROM_NATIVE(y)     osl_SocketOptionLevelFromNative(y)
 
 /*****************************************************************************/
 /* enum oslSocketMsgFlag */
@@ -192,7 +189,6 @@ static DWORD SocketMsgFlagMap[]= {
 
 /* macros */
 #define MSG_FLAG_TO_NATIVE(x)       SocketMsgFlagMap[x]
-#define MSG_FLAG_FROM_NATIVE(y)     osl_SocketMsgFlagFromNative(y)
 
 /*****************************************************************************/
 /* enum oslSocketDirection */
@@ -206,7 +202,6 @@ static DWORD SocketDirection[]= {
 
 /* macros */
 #define DIRECTION_TO_NATIVE(x)      SocketDirection[x]
-#define DIRECTION_FROM_NATIVE(y)    osl_SocketDirectionFromNative(y)
 
 /*****************************************************************************/
 /* enum oslSocketError */
@@ -264,7 +259,6 @@ static oslSocketError osl_SocketErrorFromNative(int nativeType)
 }
 
 /* macros */
-#define ERROR_TO_NATIVE(x)      SocketError[x]
 #define ERROR_FROM_NATIVE(y)    osl_SocketErrorFromNative(y)
 
 /*****************************************************************************/
diff --git a/sal/osl/w32/thread.c b/sal/osl/w32/thread.c
index 5281ace5a2f8..87632851bcd8 100644
--- a/sal/osl/w32/thread.c
+++ b/sal/osl/w32/thread.c
@@ -39,8 +39,6 @@ typedef struct _osl_TThreadImpl
 
 } osl_TThreadImpl;
 
-#define THREADIMPL_FLAGS_TERMINATE  0x0001
-
 static unsigned __stdcall oslWorkerWrapperFunction(void* pData);
 static oslThread oslCreateThread(oslWorkerFunction pWorker, void* pThreadData, sal_uInt32 nFlags);