diff options
| -rw-r--r-- | dtrans/source/win32/clipb/MtaOleClipb.cxx | 4 | ||||
| -rw-r--r-- | embedserv/source/inc/stdafx.h | 3 | ||||
| -rw-r--r-- | extensions/source/activex/StdAfx2.h | 3 | ||||
| -rw-r--r-- | extensions/test/ole/AxTestComponents/StdAfx.h | 3 | ||||
| -rw-r--r-- | extensions/test/ole/EventListenerSample/EventListener/StdAfx.h | 3 | ||||
| -rw-r--r-- | extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.h | 3 | ||||
| -rw-r--r-- | odk/examples/OLE/activex/StdAfx2.h | 3 | ||||
| -rw-r--r-- | sfx2/source/appl/shutdowniconw32.cxx | 4 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_defs.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/platform/windows.mk | 5 | ||||
| -rw-r--r-- | sw/source/ui/vba/vbasystem.cxx | 3 |
11 files changed, 5 insertions, 32 deletions
diff --git a/dtrans/source/win32/clipb/MtaOleClipb.cxx b/dtrans/source/win32/clipb/MtaOleClipb.cxx index 4d7ee04bfa30..7dc5c7e38a53 100644 --- 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> diff --git a/embedserv/source/inc/stdafx.h b/embedserv/source/inc/stdafx.h index e2369d3f7af9..9ec4fffcabee 100644 --- 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 diff --git a/extensions/source/activex/StdAfx2.h b/extensions/source/activex/StdAfx2.h index 0c48a5e5fb5a..4d8deddf604d 100644 --- 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 diff --git a/extensions/test/ole/AxTestComponents/StdAfx.h b/extensions/test/ole/AxTestComponents/StdAfx.h index da6810aea051..211943ce4709 100644 --- 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> diff --git a/extensions/test/ole/EventListenerSample/EventListener/StdAfx.h b/extensions/test/ole/EventListenerSample/EventListener/StdAfx.h index 08ee6950931f..c901a6dbe0d9 100644 --- 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> diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.h b/extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.h index d7262d1ec595..678114bae490 100644 --- 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> diff --git a/odk/examples/OLE/activex/StdAfx2.h b/odk/examples/OLE/activex/StdAfx2.h index df14ccf949a0..1d6c6ddfd074 100644 --- 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 diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx index 6575d098f1d2..b48b1e5e6875 100644 --- 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> diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index 252690c8c0a8..e6afe0b5ad2a 100644 --- 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 := diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index 51e8906e16f3..a8ba5b1d1717 100644 --- 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) \ diff --git a/sw/source/ui/vba/vbasystem.cxx b/sw/source/ui/vba/vbasystem.cxx index 0d1091fa7d7e..035628818564 100644 --- 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 |