diff options
Diffstat (limited to 'setup_native')
11 files changed, 3 insertions, 19 deletions
diff --git a/setup_native/Library_sellangmsi.mk b/setup_native/Library_sellangmsi.mk index 2df29fc8bcfe..204e22f2ac51 100644 --- a/setup_native/Library_sellangmsi.mk +++ b/setup_native/Library_sellangmsi.mk @@ -15,6 +15,8 @@ $(eval $(call gb_Library_use_custom_headers,sellangmsi,\ $(eval $(call gb_Library_add_defs,sellangmsi,\ -U_DLL \ + -D_WIN32_WINNT=0x0502 \ + -DWIN32_LEAN_AND_MEAN \ )) $(eval $(call gb_Library_add_cxxflags,sellangmsi,\ diff --git a/setup_native/Library_shlxtmsi.mk b/setup_native/Library_shlxtmsi.mk index 84fbe72f3741..9d0186a2a28a 100644 --- a/setup_native/Library_shlxtmsi.mk +++ b/setup_native/Library_shlxtmsi.mk @@ -13,6 +13,7 @@ $(eval $(call gb_Library_use_external,shlxtmsi,boost_headers)) $(eval $(call gb_Library_add_defs,shlxtmsi,\ -U_DLL \ + -D_WIN32_WINNT=0x0502 \ )) $(eval $(call gb_Library_add_cxxflags,shlxtmsi,\ diff --git a/setup_native/source/win32/customactions/sellang/sellang.cxx b/setup_native/source/win32/customactions/sellang/sellang.cxx index 06c4c029a4e6..46b500b4b5cb 100644 --- a/setup_native/source/win32/customactions/sellang/sellang.cxx +++ b/setup_native/source/win32/customactions/sellang/sellang.cxx @@ -22,11 +22,6 @@ */ #define MAX_LANGUAGES 200 -#define WIN32_LEAN_AND_MEAN -#define _WIN32_WINNT 0x0500 -#undef WINVER -#define WINVER 0x0500 - #include <windows.h> #include <msiquery.h> #include <malloc.h> diff --git a/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx b/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx index 7b35b3cf518c..1a4f4f01bdc5 100644 --- a/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx +++ b/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#define _WIN32_WINNT 0x0401 - #ifdef _MSC_VER #pragma warning(push, 1) /* disable warnings within system headers */ #endif diff --git a/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx b/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx index 94a24cd7687c..4207837fead2 100644 --- a/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx +++ b/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#define _WIN32_WINNT 0x0401 - #ifdef _MSC_VER #pragma warning(push, 1) /* disable warnings within system headers */ #endif diff --git a/setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx b/setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx index 7def8af956db..30cc424a80da 100644 --- a/setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx +++ b/setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#define _WIN32_WINDOWS 0x0410 #ifdef _MSC_VER #pragma warning(push, 1) /* disable warnings within system headers */ #endif diff --git a/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx b/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx index 88e020f5b27e..680fc410d592 100644 --- a/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx +++ b/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx @@ -20,8 +20,6 @@ #undef UNICODE #undef _UNICODE -#define _WIN32_WINDOWS 0x0410 - #ifdef _MSC_VER #pragma warning(push, 1) /* disable warnings within system headers */ #endif diff --git a/setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx b/setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx index 1b159fd22e79..26a6760e327b 100644 --- a/setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx +++ b/setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#define _WIN32_WINDOWS 0x0410 #ifdef _MSC_VER #pragma warning(push, 1) /* disable warnings within system headers */ #endif diff --git a/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx b/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx index de3f3f6b461e..f983338936f0 100644 --- a/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx +++ b/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#define _WIN32_WINDOWS 0x0410 - #ifdef _MSC_VER #pragma warning(push, 1) /* disable warnings within system headers */ #endif diff --git a/setup_native/source/win32/customactions/shellextensions/upgrade.cxx b/setup_native/source/win32/customactions/shellextensions/upgrade.cxx index 84650116b678..5cbfe6a571ef 100644 --- a/setup_native/source/win32/customactions/shellextensions/upgrade.cxx +++ b/setup_native/source/win32/customactions/shellextensions/upgrade.cxx @@ -20,8 +20,6 @@ #undef UNICODE #undef _UNICODE -#define _WIN32_WINDOWS 0x0410 - #ifdef _MSC_VER #pragma warning(push, 1) /* disable warnings within system headers */ #endif diff --git a/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx b/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx index 7011fcdf7dd7..fb106d7cb8b5 100644 --- a/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx +++ b/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#define _WIN32_WINNT 0x0401 - #ifdef _MSC_VER #pragma warning(push, 1) /* disable warnings within system headers */ #endif |