Drop duplicate WINVER and _WIN32_WINNT defines

Just keep the definition of _WIN32_WINNT in windows.mk, which claims it automatically derivates WINVER in some sdk header. Change-Id: I0a83e91ffdc9e0fc847433a92a45424fbfcb189c Reviewed-on: https://gerrit.libreoffice.org/61631 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
2018-10-10 19:36:11 +02:00
parent 40e22f1e1b
commit c8481c8a43
11 changed files with 5 additions and 32 deletions
--- a/dtrans/source/win32/clipb/MtaOleClipb.cxx
+++ b/dtrans/source/win32/clipb/MtaOleClipb.cxx
@@ -30,10 +30,6 @@
    hidden window and forward these requests via window messages.
 */

-#if !defined WINVER
-#define WINVER 0x0400
-#endif
-
 #include <osl/diagnose.h>
 #include <sal/log.hxx>

--- a/embedserv/source/inc/stdafx.h
+++ b/embedserv/source/inc/stdafx.h
@@ -3,9 +3,6 @@
 #define AFX_STDAFX_H_

 #define STRICT
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0502
-#endif
 #define _ATL_APARTMENT_THREADED
 // #define _ATL_STATIC_REGISTRY

--- a/extensions/source/activex/StdAfx2.h
+++ b/extensions/source/activex/StdAfx2.h
@@ -25,9 +25,6 @@
 #define INCLUDED_EXTENSIONS_SOURCE_ACTIVEX_STDAFX2_H

 #define STRICT
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0502
-#endif
 #define _ATL_APARTMENT_THREADED
 #define _ATL_STATIC_REGISTRY

--- a/extensions/test/ole/AxTestComponents/StdAfx.h
+++ b/extensions/test/ole/AxTestComponents/StdAfx.h
@@ -28,9 +28,6 @@
 #endif

 #define STRICT
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0502
-#endif
 #define _ATL_APARTMENT_THREADED

 #include <atlbase.h>
--- a/extensions/test/ole/EventListenerSample/EventListener/StdAfx.h
+++ b/extensions/test/ole/EventListenerSample/EventListener/StdAfx.h
@@ -28,9 +28,6 @@
 #endif

 #define STRICT
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0502
-#endif
 #define _ATL_APARTMENT_THREADED

 #include <atlbase.h>
--- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.h
+++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.h
@@ -28,9 +28,6 @@
 #endif

 #define STRICT
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0502
-#endif
 #define _ATL_APARTMENT_THREADED

 #include <stdio.h>
--- a/odk/examples/OLE/activex/StdAfx2.h
+++ b/odk/examples/OLE/activex/StdAfx2.h
@@ -41,9 +41,6 @@
 #define INCLUDED_EXAMPLES_ACTIVEX_STDAFX2_H

 #define STRICT
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0502
-#endif
 #define _ATL_APARTMENT_THREADED
 #define _ATL_STATIC_REGISTRY

--- a/sfx2/source/appl/shutdowniconw32.cxx
+++ b/sfx2/source/appl/shutdowniconw32.cxx
@@ -16,10 +16,6 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

-#if !defined WINVER
-#define WINVER 0x0400
-#endif
-
 #include <sal/macros.h>
 #include <sal/log.hxx>

--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -66,8 +66,7 @@ gb_COMPILERDEFS += \
 endif

 gb_RCDEFS := \
-	-DWINVER=0x0502 \
-	-DWIN32 \
+	$(gb_WIN_VERSION_DEFS) \

 gb_RCFLAGS :=

--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -26,10 +26,13 @@ gb_MKTEMP := mktemp --tmpdir=$(gb_TMPDIR) gbuild.XXXXXX
 # current baseline is Windows 7 (NT 6.1)
 # for _WIN32_IE, if _WIN32_WINNT >= 0x0600 the derived value from
 # sdkddkver.h is sufficient
-gb_OSDEFS := \
+gb_WIN_VERSION_DEFS := \
 	-D_WIN32_WINNT=0x0601 \
 	-DWIN32 \
 	-DWNT \
+
+gb_OSDEFS := \
+	$(gb_WIN_VERSION_DEFS) \
 	-DNOMINMAX \
 	$(LFS_CFLAGS) \

--- a/sw/source/ui/vba/vbasystem.cxx
+++ b/sw/source/ui/vba/vbasystem.cxx
@@ -26,9 +26,6 @@
 #include <o3tl/char16_t2wchar_t.hxx>

 #ifdef _WIN32
-#if !defined WINVER
-# define WINVER 0x0400
-#endif
 #if !defined WIN32_LEAN_AND_MEAN
 # define WIN32_LEAN_AND_MEAN
 #endif