setup_native: warning C4005: macro redefinition

Change-Id: I34bea8aaedec8df47874c5230c87455aa1ce6883

setup_native: warning C4005: macro redefinition
Change-Id: I34bea8aaedec8df47874c5230c87455aa1ce6883
80645155 · Michael Stahl · 1edb5b37 · 80645155 · 80645155
Kaydet (Commit) 80645155 authored Kas 20, 2013 tarafından Michael Stahl
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Library_sellangmsi.mk setup_native/Library_sellangmsi.mk +0 -1

sellang.cxx setup_native/source/win32/customactions/sellang/sellang.cxx +1 -0

No files found.
--- a/setup_native/Library_sellangmsi.mk
+++ b/setup_native/Library_sellangmsi.mk
@@ -16,7 +16,6 @@ $(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,\

--- a/setup_native/source/win32/customactions/sellang/sellang.cxx
+++ b/setup_native/source/win32/customactions/sellang/sellang.cxx
@@ -22,6 +22,7 @@
 */
 #define MAX_LANGUAGES 200

+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <msiquery.h>
 #include <malloc.h>