setup_native/Library_sellangmsi.mk | 1 - setup_native/source/win32/customactions/sellang/sellang.cxx | 1 + 2 files changed, 1 insertion(+), 1 deletion(-)
New commits: commit 806451556adcb010e1466d5bd1a170a35e36095d Author: Michael Stahl <[email protected]> Date: Wed Nov 20 16:24:42 2013 +0100 setup_native: warning C4005: macro redefinition Change-Id: I34bea8aaedec8df47874c5230c87455aa1ce6883 diff --git a/setup_native/Library_sellangmsi.mk b/setup_native/Library_sellangmsi.mk index 204e22f..3f8947f 100644 --- 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,\ diff --git a/setup_native/source/win32/customactions/sellang/sellang.cxx b/setup_native/source/win32/customactions/sellang/sellang.cxx index 46b500b..e9c4c57 100644 --- 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> _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
