Drop UNICODE/_UNICODE defines

The code is using expicit (mostly W) Windows API, and is independent from the macro. Removing it here allows to catch places where some UNICODE-dependent macro is used unintentionally. Change-Id: I5dff40aecfc3c3dc7fc4cf7271a995a675943a45 Reviewed-on: https://gerrit.libreoffice.org/70237 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
2019-04-03 14:10:16 +03:00 · 2019-04-03 14:10:16 +03:00 · 558956dc81
commit 558956dc81
parent 50580f452c
34 changed files with 1 additions and 108 deletions
--- a/comphelper/StaticLibrary_windows_process.mk
+++ b/comphelper/StaticLibrary_windows_process.mk
@ -13,10 +13,6 @@ $(eval $(call gb_StaticLibrary_set_include,windows_process,\
 	$$(INCLUDE) \
 ))

-$(eval $(call gb_StaticLibrary_add_defs,windows_process,\
-	-DUNICODE \
-))
-
 $(eval $(call gb_StaticLibrary_add_exception_objects,windows_process,\
 	comphelper/source/windows/windows_process \
 ))
--- a/desktop/Executable_minidump_upload.mk
+++ b/desktop/Executable_minidump_upload.mk
@ -14,10 +14,6 @@ $(eval $(call gb_Executable_use_libraries,minidump_upload,\
    sal \
 ))

-$(eval $(call gb_Executable_add_defs,minidump_upload,\
-	-DUNICODE \
-))
-
 $(eval $(call gb_Executable_use_external,minidump_upload,curl))

 $(eval $(call gb_Executable_add_exception_objects,minidump_upload,\
--- a/desktop/Executable_sbase.mk
+++ b/desktop/Executable_sbase.mk
@ -11,10 +11,6 @@ $(eval $(call gb_Executable_Executable,sbase))

 $(eval $(call gb_Executable_set_targettype_gui,sbase,YES))

-$(eval $(call gb_Executable_add_defs,sbase,\
-    -DUNICODE \
-))
-
 $(eval $(call gb_Executable_add_ldflags,sbase,\
    /ENTRY:wWinMainCRTStartup \
 ))
--- a/desktop/Executable_scalc.mk
+++ b/desktop/Executable_scalc.mk
@ -11,10 +11,6 @@ $(eval $(call gb_Executable_Executable,scalc))

 $(eval $(call gb_Executable_set_targettype_gui,scalc,YES))

-$(eval $(call gb_Executable_add_defs,scalc,\
-    -DUNICODE \
-))
-
 $(eval $(call gb_Executable_add_ldflags,scalc,\
    /ENTRY:wWinMainCRTStartup \
 ))
--- a/desktop/Executable_sdraw.mk
+++ b/desktop/Executable_sdraw.mk
@ -11,10 +11,6 @@ $(eval $(call gb_Executable_Executable,sdraw))

 $(eval $(call gb_Executable_set_targettype_gui,sdraw,YES))

-$(eval $(call gb_Executable_add_defs,sdraw,\
-    -DUNICODE \
-))
-
 $(eval $(call gb_Executable_add_ldflags,sdraw,\
    /ENTRY:wWinMainCRTStartup \
 ))
--- a/desktop/Executable_simpress.mk
+++ b/desktop/Executable_simpress.mk
@ -11,10 +11,6 @@ $(eval $(call gb_Executable_Executable,simpress))

 $(eval $(call gb_Executable_set_targettype_gui,simpress,YES))

-$(eval $(call gb_Executable_add_defs,simpress,\
-    -DUNICODE \
-))
-
 $(eval $(call gb_Executable_add_ldflags,simpress,\
    /ENTRY:wWinMainCRTStartup \
 ))
--- a/desktop/Executable_smath.mk
+++ b/desktop/Executable_smath.mk
@ -11,10 +11,6 @@ $(eval $(call gb_Executable_Executable,smath))

 $(eval $(call gb_Executable_set_targettype_gui,smath,YES))

-$(eval $(call gb_Executable_add_defs,smath,\
-    -DUNICODE \
-))
-
 $(eval $(call gb_Executable_add_ldflags,smath,\
    /ENTRY:wWinMainCRTStartup \
 ))
--- a/desktop/Executable_sweb.mk
+++ b/desktop/Executable_sweb.mk
@ -11,10 +11,6 @@ $(eval $(call gb_Executable_Executable,sweb))

 $(eval $(call gb_Executable_set_targettype_gui,sweb,YES))

-$(eval $(call gb_Executable_add_defs,sweb,\
-    -DUNICODE \
-))
-
 $(eval $(call gb_Executable_add_ldflags,sweb,\
    /ENTRY:wWinMainCRTStartup \
 ))
--- a/desktop/Executable_swriter.mk
+++ b/desktop/Executable_swriter.mk
@ -11,10 +11,6 @@ $(eval $(call gb_Executable_Executable,swriter))

 $(eval $(call gb_Executable_set_targettype_gui,swriter,YES))

-$(eval $(call gb_Executable_add_defs,swriter,\
-    -DUNICODE \
-))
-
 $(eval $(call gb_Executable_add_ldflags,swriter,\
    /ENTRY:wWinMainCRTStartup \
 ))
--- a/desktop/StaticLibrary_winlauncher.mk
+++ b/desktop/StaticLibrary_winlauncher.mk
@ -10,10 +10,6 @@

 $(eval $(call gb_StaticLibrary_StaticLibrary,winlauncher))

-$(eval $(call gb_StaticLibrary_add_defs,winlauncher,\
-    -DUNICODE \
-))
-
 $(eval $(call gb_StaticLibrary_add_exception_objects,winlauncher,\
    desktop/win32/source/applauncher/launcher \
 ))
--- a/dtrans/Library_sysdtrans.mk
+++ b/dtrans/Library_sysdtrans.mk
@ -23,11 +23,6 @@ $(eval $(call gb_Library_set_componentfile,sysdtrans,dtrans/util/sysdtrans))

 $(eval $(call gb_Library_use_sdk_api,sysdtrans))

-$(eval $(call gb_Library_add_defs,sysdtrans,\
-	-D_UNICODE \
-	-DUNICODE \
-))
-
 $(eval $(call gb_Library_use_libraries,sysdtrans,\
 	comphelper \
 	cppu \
--- a/fpicker/Library_fps.mk
+++ b/fpicker/Library_fps.mk
@ -27,11 +27,6 @@ $(eval $(call gb_Library_use_external,fps,boost_headers))

 $(eval $(call gb_Library_use_sdk_api,fps))

-$(eval $(call gb_Library_add_defs,fps,\
-	-D_UNICODE \
-	-DUNICODE \
-))
-
 $(eval $(call gb_Library_use_libraries,fps,\
 	comphelper \
 	cppu \
--- a/onlineupdate/Executable_mar.mk
+++ b/onlineupdate/Executable_mar.mk
@ -33,7 +33,6 @@ $(eval $(call gb_Executable_use_externals,mar,\
 ))

 $(eval $(call gb_Executable_add_defs,mar,\
-	-DUNICODE \
 	-DMAR_NSS \
 ))

--- a/onlineupdate/Executable_mbsdiff.mk
+++ b/onlineupdate/Executable_mbsdiff.mk
@ -25,10 +25,6 @@ $(eval $(call gb_Executable_add_libs,mbsdiff,\
 ))
 endif

-$(eval $(call gb_Executable_add_defs,mbsdiff,\
-	-DUNICODE \
-))
-
 $(eval $(call gb_Executable_add_cxxobjects,mbsdiff,\
 	onlineupdate/source/mbsdiff/bsdiff \
 ))
--- a/onlineupdate/Executable_test_updater_dialog.mk
+++ b/onlineupdate/Executable_test_updater_dialog.mk
@ -39,10 +39,6 @@ $(eval $(call gb_Executable_add_ldflags,test_updater_dialog,\
 	/ENTRY:wmainCRTStartup \
 ))

-$(eval $(call gb_Executable_add_defs,test_updater_dialog,\
-	-DUNICODE \
-))
-
 else

 $(eval $(call gb_Executable_add_defs,test_updater_dialog,\
--- a/onlineupdate/Executable_update_service.mk
+++ b/onlineupdate/Executable_update_service.mk
@ -42,10 +42,6 @@ $(eval $(call gb_Executable_add_libs,update_service,\
    advapi32.lib \
 ))

-$(eval $(call gb_Executable_add_defs,update_service,\
-	-DUNICODE \
-))
-
 $(eval $(call gb_Executable_add_ldflags,update_service,\
    /ENTRY:wmainCRTStartup \
 ))
--- a/onlineupdate/Executable_updater.mk
+++ b/onlineupdate/Executable_updater.mk
@ -50,7 +50,6 @@ $(eval $(call gb_Executable_add_ldflags,updater,\

 $(eval $(call gb_Executable_add_defs,updater,\
 	-DVERIFY_MAR_SIGNATURE \
-	-DUNICODE \
 ))

 else
--- a/onlineupdate/StaticLibrary_libmar.mk
+++ b/onlineupdate/StaticLibrary_libmar.mk
@ -14,10 +14,6 @@ $(eval $(call gb_StaticLibrary_set_include,libmar,\
 	$$(INCLUDE) \
 ))

-$(eval $(call gb_StaticLibrary_add_defs,libmar,\
-	-DUNICODE \
-))
-
 $(eval $(call gb_StaticLibrary_add_cobjects,libmar,\
 	onlineupdate/source/libmar/src/mar_create \
 	onlineupdate/source/libmar/src/mar_extract \
--- a/onlineupdate/StaticLibrary_libmarverify.mk
+++ b/onlineupdate/StaticLibrary_libmarverify.mk
@ -14,11 +14,7 @@ $(eval $(call gb_StaticLibrary_set_include,libmarverify,\
 	$$(INCLUDE) \
 ))

-ifeq ($(OS),WNT)
-$(eval $(call gb_StaticLibrary_add_defs,libmarverify,\
-	-DUNICODE \
-))
-else
+ifneq ($(OS),WNT)
 $(eval $(call gb_StaticLibrary_add_defs,libmarverify,\
 	-DMAR_NSS \
 ))
--- a/onlineupdate/StaticLibrary_updatehelper.mk
+++ b/onlineupdate/StaticLibrary_updatehelper.mk
@ -16,7 +16,6 @@ $(eval $(call gb_StaticLibrary_set_include,updatehelper,\
 ))

 $(eval $(call gb_StaticLibrary_add_defs,updatehelper,\
-	-DUNICODE \
 	-DNSS3 \
 	-DVERIFY_MAR_SIGNATURE \
 ))
--- a/setup_native/Library_reg4allmsdoc.mk
+++ b/setup_native/Library_reg4allmsdoc.mk
@ -10,8 +10,6 @@
 $(eval $(call gb_Library_Library,reg4allmsdoc))

 $(eval $(call gb_Library_add_defs,reg4allmsdoc,\
-	-DUNICODE \
-	-D_UNICODE \
 	-U_DLL \
 ))

--- a/setup_native/Library_shlxtmsi.mk
+++ b/setup_native/Library_shlxtmsi.mk
@ -12,8 +12,6 @@ $(eval $(call gb_Library_Library,shlxtmsi))
 $(eval $(call gb_Library_use_external,shlxtmsi,boost_headers))

 $(eval $(call gb_Library_add_defs,shlxtmsi,\
-	-DUNICODE \
-	-D_UNICODE \
 	-U_DLL \
 ))

--- a/setup_native/StaticLibrary_quickstarter.mk
+++ b/setup_native/StaticLibrary_quickstarter.mk
@ -10,8 +10,6 @@
 $(eval $(call gb_StaticLibrary_StaticLibrary,quickstarter))

 $(eval $(call gb_StaticLibrary_add_defs,quickstarter,\
-	-DUNICODE \
-	-D_UNICODE \
 	-U_DLL \
 ))

--- a/shell/Library_ooofilt.mk
+++ b/shell/Library_ooofilt.mk
@ -16,9 +16,7 @@ $(eval $(call gb_Library_set_include,ooofilt,\

 $(eval $(call gb_Library_add_defs,ooofilt,\
 	-DISOLATION_AWARE_ENABLED \
-	-DUNICODE \
 	-DWIN32_LEAN_AND_MEAN \
-	-D_UNICODE \
 	-UNOMINMAX \
 ))

--- a/shell/Library_ooofilt_x64.mk
+++ b/shell/Library_ooofilt_x64.mk
@ -22,9 +22,7 @@ $(eval $(call gb_Library_set_include,ooofilt_x64,\

 $(eval $(call gb_Library_add_defs,ooofilt_x64,\
 	-DISOLATION_AWARE_ENABLED \
-	-DUNICODE \
 	-DWIN32_LEAN_AND_MEAN \
-	-D_UNICODE \
 	-UNOMINMAX \
 ))

--- a/shell/Library_propertyhdl.mk
+++ b/shell/Library_propertyhdl.mk
@ -16,9 +16,7 @@ $(eval $(call gb_Library_set_include,propertyhdl,\

 $(eval $(call gb_Library_add_defs,propertyhdl,\
 	-DISOLATION_AWARE_ENABLED \
-	-DUNICODE \
 	-DWIN32_LEAN_AND_MEAN \
-	-D_UNICODE \
 	-UNOMINMAX \
 ))

--- a/shell/Library_propertyhdl_x64.mk
+++ b/shell/Library_propertyhdl_x64.mk
@ -22,9 +22,7 @@ $(eval $(call gb_Library_set_include,propertyhdl_x64,\

 $(eval $(call gb_Library_add_defs,propertyhdl_x64,\
 	-DISOLATION_AWARE_ENABLED \
-	-DUNICODE \
 	-DWIN32_LEAN_AND_MEAN \
-	-D_UNICODE \
 	-UNOMINMAX \
 ))

--- a/shell/Library_shlxthdl.mk
+++ b/shell/Library_shlxthdl.mk
@ -16,9 +16,7 @@ $(eval $(call gb_Library_set_include,shlxthdl,\

 $(eval $(call gb_Library_add_defs,shlxthdl,\
 	-DISOLATION_AWARE_ENABLED \
-	-DUNICODE \
 	-DWIN32_LEAN_AND_MEAN \
-	-D_UNICODE \
 	-UNOMINMAX \
 ))

--- a/shell/Library_shlxthdl_x64.mk
+++ b/shell/Library_shlxthdl_x64.mk
@ -22,9 +22,7 @@ $(eval $(call gb_Library_set_include,shlxthdl_x64,\

 $(eval $(call gb_Library_add_defs,shlxthdl_x64,\
 	-DISOLATION_AWARE_ENABLED \
-	-DUNICODE \
 	-DWIN32_LEAN_AND_MEAN \
-	-D_UNICODE \
 	-UNOMINMAX \
 ))

--- a/shell/Library_spsupp.mk
+++ b/shell/Library_spsupp.mk
@ -18,11 +18,6 @@ $(eval $(call gb_Library_set_include,spsupp,\
 	$$(INCLUDE) \
 ))

-$(eval $(call gb_Library_add_defs,spsupp,\
-	-DUNICODE \
-	-D_UNICODE \
-))
-
 $(eval $(call gb_Library_use_system_win32_libs,spsupp,\
 	advapi32 \
 	kernel32 \
--- a/shell/Library_spsupp_x64.mk
+++ b/shell/Library_spsupp_x64.mk
@ -21,11 +21,6 @@ $(eval $(call gb_Library_set_include,spsupp_x64,\
 	$$(INCLUDE) \
 ))

-$(eval $(call gb_Library_add_defs,spsupp_x64,\
-	-DUNICODE \
-	-D_UNICODE \
-))
-
 $(eval $(call gb_Library_use_system_win32_libs,spsupp_x64,\
 	advapi32 \
 	kernel32 \
--- a/shell/StaticLibrary_shlxthandler_common.mk
+++ b/shell/StaticLibrary_shlxthandler_common.mk
@ -16,9 +16,7 @@ $(eval $(call gb_StaticLibrary_set_include,shlxthandler_common,\

 $(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common,\
 	-DISOLATION_AWARE_ENABLED \
-	-DUNICODE \
 	-DWIN32_LEAN_AND_MEAN \
-	-D_UNICODE \
 ))

 $(eval $(call gb_StaticLibrary_use_externals,shlxthandler_common,\
--- a/shell/StaticLibrary_shlxthandler_common_x64.mk
+++ b/shell/StaticLibrary_shlxthandler_common_x64.mk
@ -22,9 +22,7 @@ $(eval $(call gb_StaticLibrary_set_include,shlxthandler_common_x64,\

 $(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common_x64,\
 	-DISOLATION_AWARE_ENABLED \
-	-DUNICODE \
 	-DWIN32_LEAN_AND_MEAN \
-	-D_UNICODE \
 ))

 $(eval $(call gb_StaticLibrary_use_externals,shlxthandler_common_x64,\
--- a/winaccessibility/Library_uacccom.mk
+++ b/winaccessibility/Library_uacccom.mk
@ -21,8 +21,6 @@ $(eval $(call gb_Library_set_include,UAccCOM,\

 $(eval $(call gb_Library_add_defs,UAccCOM,\
 	-DUACCCOM_DLLIMPLEMENTATION \
-	-D_UNICODE \
-	-DUNICODE \
 ))

 $(eval $(call gb_Library_use_sdk_api,UAccCOM))