ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Drop UNICODE/_UNICODE defines

Browse Source 
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>
This commit is contained in:
Mike Kaganski
2019-04-04 13:57:59 +02:00
parent 50580f452c
commit 558956dc81
34 changed files with 1 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
comphelper/StaticLibrary_windows_process.mk
-4
View File
@@ -13,10 +13,6 @@ $(eval $(call gb_StaticLibrary_set_include,windows_process,\
$$(INCLUDE) \ $$(INCLUDE) \
)) ))
$(eval $(call gb_StaticLibrary_add_defs,windows_process,\
-DUNICODE \
))
$(eval $(call gb_StaticLibrary_add_exception_objects,windows_process,\ $(eval $(call gb_StaticLibrary_add_exception_objects,windows_process,\
comphelper/source/windows/windows_process \ comphelper/source/windows/windows_process \
)) ))
desktop/Executable_minidump_upload.mk
-4
View File
@@ -14,10 +14,6 @@ $(eval $(call gb_Executable_use_libraries,minidump_upload,\
sal \ sal \
)) ))
$(eval $(call gb_Executable_add_defs,minidump_upload,\
-DUNICODE \
))
$(eval $(call gb_Executable_use_external,minidump_upload,curl)) $(eval $(call gb_Executable_use_external,minidump_upload,curl))
$(eval $(call gb_Executable_add_exception_objects,minidump_upload,\ $(eval $(call gb_Executable_add_exception_objects,minidump_upload,\
desktop/Executable_sbase.mk
-4
View File
@@ -11,10 +11,6 @@ $(eval $(call gb_Executable_Executable,sbase))
$(eval $(call gb_Executable_set_targettype_gui,sbase,YES)) $(eval $(call gb_Executable_set_targettype_gui,sbase,YES))
$(eval $(call gb_Executable_add_defs,sbase,\
-DUNICODE \
))
$(eval $(call gb_Executable_add_ldflags,sbase,\ $(eval $(call gb_Executable_add_ldflags,sbase,\
/ENTRY:wWinMainCRTStartup \ /ENTRY:wWinMainCRTStartup \
)) ))
desktop/Executable_scalc.mk
-4
View File
@@ -11,10 +11,6 @@ $(eval $(call gb_Executable_Executable,scalc))
$(eval $(call gb_Executable_set_targettype_gui,scalc,YES)) $(eval $(call gb_Executable_set_targettype_gui,scalc,YES))
$(eval $(call gb_Executable_add_defs,scalc,\
-DUNICODE \
))
$(eval $(call gb_Executable_add_ldflags,scalc,\ $(eval $(call gb_Executable_add_ldflags,scalc,\
/ENTRY:wWinMainCRTStartup \ /ENTRY:wWinMainCRTStartup \
)) ))
desktop/Executable_sdraw.mk
-4
View File
@@ -11,10 +11,6 @@ $(eval $(call gb_Executable_Executable,sdraw))
$(eval $(call gb_Executable_set_targettype_gui,sdraw,YES)) $(eval $(call gb_Executable_set_targettype_gui,sdraw,YES))
$(eval $(call gb_Executable_add_defs,sdraw,\
-DUNICODE \
))
$(eval $(call gb_Executable_add_ldflags,sdraw,\ $(eval $(call gb_Executable_add_ldflags,sdraw,\
/ENTRY:wWinMainCRTStartup \ /ENTRY:wWinMainCRTStartup \
)) ))
desktop/Executable_simpress.mk
-4
View File
@@ -11,10 +11,6 @@ $(eval $(call gb_Executable_Executable,simpress))
$(eval $(call gb_Executable_set_targettype_gui,simpress,YES)) $(eval $(call gb_Executable_set_targettype_gui,simpress,YES))
$(eval $(call gb_Executable_add_defs,simpress,\
-DUNICODE \
))
$(eval $(call gb_Executable_add_ldflags,simpress,\ $(eval $(call gb_Executable_add_ldflags,simpress,\
/ENTRY:wWinMainCRTStartup \ /ENTRY:wWinMainCRTStartup \
)) ))
desktop/Executable_smath.mk
-4
View File
@@ -11,10 +11,6 @@ $(eval $(call gb_Executable_Executable,smath))
$(eval $(call gb_Executable_set_targettype_gui,smath,YES)) $(eval $(call gb_Executable_set_targettype_gui,smath,YES))
$(eval $(call gb_Executable_add_defs,smath,\
-DUNICODE \
))
$(eval $(call gb_Executable_add_ldflags,smath,\ $(eval $(call gb_Executable_add_ldflags,smath,\
/ENTRY:wWinMainCRTStartup \ /ENTRY:wWinMainCRTStartup \
)) ))
desktop/Executable_sweb.mk
-4
View File
@@ -11,10 +11,6 @@ $(eval $(call gb_Executable_Executable,sweb))
$(eval $(call gb_Executable_set_targettype_gui,sweb,YES)) $(eval $(call gb_Executable_set_targettype_gui,sweb,YES))
$(eval $(call gb_Executable_add_defs,sweb,\
-DUNICODE \
))
$(eval $(call gb_Executable_add_ldflags,sweb,\ $(eval $(call gb_Executable_add_ldflags,sweb,\
/ENTRY:wWinMainCRTStartup \ /ENTRY:wWinMainCRTStartup \
)) ))
desktop/Executable_swriter.mk
-4
View File
@@ -11,10 +11,6 @@ $(eval $(call gb_Executable_Executable,swriter))
$(eval $(call gb_Executable_set_targettype_gui,swriter,YES)) $(eval $(call gb_Executable_set_targettype_gui,swriter,YES))
$(eval $(call gb_Executable_add_defs,swriter,\
-DUNICODE \
))
$(eval $(call gb_Executable_add_ldflags,swriter,\ $(eval $(call gb_Executable_add_ldflags,swriter,\
/ENTRY:wWinMainCRTStartup \ /ENTRY:wWinMainCRTStartup \
)) ))
desktop/StaticLibrary_winlauncher.mk
-4
View File
@@ -10,10 +10,6 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,winlauncher)) $(eval $(call gb_StaticLibrary_StaticLibrary,winlauncher))
$(eval $(call gb_StaticLibrary_add_defs,winlauncher,\
-DUNICODE \
))
$(eval $(call gb_StaticLibrary_add_exception_objects,winlauncher,\ $(eval $(call gb_StaticLibrary_add_exception_objects,winlauncher,\
desktop/win32/source/applauncher/launcher \ desktop/win32/source/applauncher/launcher \
)) ))
dtrans/Library_sysdtrans.mk
-5
View File
@@ -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_use_sdk_api,sysdtrans))
$(eval $(call gb_Library_add_defs,sysdtrans,\
-D_UNICODE \
-DUNICODE \
))
$(eval $(call gb_Library_use_libraries,sysdtrans,\ $(eval $(call gb_Library_use_libraries,sysdtrans,\
comphelper \ comphelper \
cppu \ cppu \
fpicker/Library_fps.mk
-5
View File
@@ -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_use_sdk_api,fps))
$(eval $(call gb_Library_add_defs,fps,\
-D_UNICODE \
-DUNICODE \
))
$(eval $(call gb_Library_use_libraries,fps,\ $(eval $(call gb_Library_use_libraries,fps,\
comphelper \ comphelper \
cppu \ cppu \
onlineupdate/Executable_mar.mk
-1
View File
@@ -33,7 +33,6 @@ $(eval $(call gb_Executable_use_externals,mar,\
)) ))
$(eval $(call gb_Executable_add_defs,mar,\ $(eval $(call gb_Executable_add_defs,mar,\
-DUNICODE \
-DMAR_NSS \ -DMAR_NSS \
)) ))
onlineupdate/Executable_mbsdiff.mk
-4
View File
@@ -25,10 +25,6 @@ $(eval $(call gb_Executable_add_libs,mbsdiff,\
)) ))
endif endif
$(eval $(call gb_Executable_add_defs,mbsdiff,\
-DUNICODE \
))
$(eval $(call gb_Executable_add_cxxobjects,mbsdiff,\ $(eval $(call gb_Executable_add_cxxobjects,mbsdiff,\
onlineupdate/source/mbsdiff/bsdiff \ onlineupdate/source/mbsdiff/bsdiff \
)) ))
onlineupdate/Executable_test_updater_dialog.mk
-4
View File
@@ -39,10 +39,6 @@ $(eval $(call gb_Executable_add_ldflags,test_updater_dialog,\
/ENTRY:wmainCRTStartup \ /ENTRY:wmainCRTStartup \
)) ))
$(eval $(call gb_Executable_add_defs,test_updater_dialog,\
-DUNICODE \
))
else else
$(eval $(call gb_Executable_add_defs,test_updater_dialog,\ $(eval $(call gb_Executable_add_defs,test_updater_dialog,\
onlineupdate/Executable_update_service.mk
-4
View File
@@ -42,10 +42,6 @@ $(eval $(call gb_Executable_add_libs,update_service,\
advapi32.lib \ advapi32.lib \
)) ))
$(eval $(call gb_Executable_add_defs,update_service,\
-DUNICODE \
))
$(eval $(call gb_Executable_add_ldflags,update_service,\ $(eval $(call gb_Executable_add_ldflags,update_service,\
/ENTRY:wmainCRTStartup \ /ENTRY:wmainCRTStartup \
)) ))
onlineupdate/Executable_updater.mk
-1
View File
@@ -50,7 +50,6 @@ $(eval $(call gb_Executable_add_ldflags,updater,\
$(eval $(call gb_Executable_add_defs,updater,\ $(eval $(call gb_Executable_add_defs,updater,\
-DVERIFY_MAR_SIGNATURE \ -DVERIFY_MAR_SIGNATURE \
-DUNICODE \
)) ))
else else
onlineupdate/StaticLibrary_libmar.mk
-4
View File
@@ -14,10 +14,6 @@ $(eval $(call gb_StaticLibrary_set_include,libmar,\
$$(INCLUDE) \ $$(INCLUDE) \
)) ))
$(eval $(call gb_StaticLibrary_add_defs,libmar,\
-DUNICODE \
))
$(eval $(call gb_StaticLibrary_add_cobjects,libmar,\ $(eval $(call gb_StaticLibrary_add_cobjects,libmar,\
onlineupdate/source/libmar/src/mar_create \ onlineupdate/source/libmar/src/mar_create \
onlineupdate/source/libmar/src/mar_extract \ onlineupdate/source/libmar/src/mar_extract \
onlineupdate/StaticLibrary_libmarverify.mk
+1 -5
View File
@@ -14,11 +14,7 @@ $(eval $(call gb_StaticLibrary_set_include,libmarverify,\
$$(INCLUDE) \ $$(INCLUDE) \
)) ))
ifeq ($(OS),WNT) ifneq ($(OS),WNT)
$(eval $(call gb_StaticLibrary_add_defs,libmarverify,\
-DUNICODE \
))
else
$(eval $(call gb_StaticLibrary_add_defs,libmarverify,\ $(eval $(call gb_StaticLibrary_add_defs,libmarverify,\
-DMAR_NSS \ -DMAR_NSS \
)) ))
onlineupdate/StaticLibrary_updatehelper.mk
-1
View File
@@ -16,7 +16,6 @@ $(eval $(call gb_StaticLibrary_set_include,updatehelper,\
)) ))
$(eval $(call gb_StaticLibrary_add_defs,updatehelper,\ $(eval $(call gb_StaticLibrary_add_defs,updatehelper,\
-DUNICODE \
-DNSS3 \ -DNSS3 \
-DVERIFY_MAR_SIGNATURE \ -DVERIFY_MAR_SIGNATURE \
)) ))
setup_native/Library_reg4allmsdoc.mk
-2
View File
@@ -10,8 +10,6 @@
$(eval $(call gb_Library_Library,reg4allmsdoc)) $(eval $(call gb_Library_Library,reg4allmsdoc))
$(eval $(call gb_Library_add_defs,reg4allmsdoc,\ $(eval $(call gb_Library_add_defs,reg4allmsdoc,\
-DUNICODE \
-D_UNICODE \
-U_DLL \ -U_DLL \
)) ))
setup_native/Library_shlxtmsi.mk
-2
View File
@@ -12,8 +12,6 @@ $(eval $(call gb_Library_Library,shlxtmsi))
$(eval $(call gb_Library_use_external,shlxtmsi,boost_headers)) $(eval $(call gb_Library_use_external,shlxtmsi,boost_headers))
$(eval $(call gb_Library_add_defs,shlxtmsi,\ $(eval $(call gb_Library_add_defs,shlxtmsi,\
-DUNICODE \
-D_UNICODE \
-U_DLL \ -U_DLL \
)) ))
setup_native/StaticLibrary_quickstarter.mk
-2
View File
@@ -10,8 +10,6 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,quickstarter)) $(eval $(call gb_StaticLibrary_StaticLibrary,quickstarter))
$(eval $(call gb_StaticLibrary_add_defs,quickstarter,\ $(eval $(call gb_StaticLibrary_add_defs,quickstarter,\
-DUNICODE \
-D_UNICODE \
-U_DLL \ -U_DLL \
)) ))
shell/Library_ooofilt.mk
-2
View File
@@ -16,9 +16,7 @@ $(eval $(call gb_Library_set_include,ooofilt,\
$(eval $(call gb_Library_add_defs,ooofilt,\ $(eval $(call gb_Library_add_defs,ooofilt,\
-DISOLATION_AWARE_ENABLED \ -DISOLATION_AWARE_ENABLED \
-DUNICODE \
-DWIN32_LEAN_AND_MEAN \ -DWIN32_LEAN_AND_MEAN \
-D_UNICODE \
-UNOMINMAX \ -UNOMINMAX \
)) ))
shell/Library_ooofilt_x64.mk
-2
View File
@@ -22,9 +22,7 @@ $(eval $(call gb_Library_set_include,ooofilt_x64,\
$(eval $(call gb_Library_add_defs,ooofilt_x64,\ $(eval $(call gb_Library_add_defs,ooofilt_x64,\
-DISOLATION_AWARE_ENABLED \ -DISOLATION_AWARE_ENABLED \
-DUNICODE \
-DWIN32_LEAN_AND_MEAN \ -DWIN32_LEAN_AND_MEAN \
-D_UNICODE \
-UNOMINMAX \ -UNOMINMAX \
)) ))
shell/Library_propertyhdl.mk
-2
View File
@@ -16,9 +16,7 @@ $(eval $(call gb_Library_set_include,propertyhdl,\
$(eval $(call gb_Library_add_defs,propertyhdl,\ $(eval $(call gb_Library_add_defs,propertyhdl,\
-DISOLATION_AWARE_ENABLED \ -DISOLATION_AWARE_ENABLED \
-DUNICODE \
-DWIN32_LEAN_AND_MEAN \ -DWIN32_LEAN_AND_MEAN \
-D_UNICODE \
-UNOMINMAX \ -UNOMINMAX \
)) ))
shell/Library_propertyhdl_x64.mk
-2
View File
@@ -22,9 +22,7 @@ $(eval $(call gb_Library_set_include,propertyhdl_x64,\
$(eval $(call gb_Library_add_defs,propertyhdl_x64,\ $(eval $(call gb_Library_add_defs,propertyhdl_x64,\
-DISOLATION_AWARE_ENABLED \ -DISOLATION_AWARE_ENABLED \
-DUNICODE \
-DWIN32_LEAN_AND_MEAN \ -DWIN32_LEAN_AND_MEAN \
-D_UNICODE \
-UNOMINMAX \ -UNOMINMAX \
)) ))
shell/Library_shlxthdl.mk
-2
View File
@@ -16,9 +16,7 @@ $(eval $(call gb_Library_set_include,shlxthdl,\
$(eval $(call gb_Library_add_defs,shlxthdl,\ $(eval $(call gb_Library_add_defs,shlxthdl,\
-DISOLATION_AWARE_ENABLED \ -DISOLATION_AWARE_ENABLED \
-DUNICODE \
-DWIN32_LEAN_AND_MEAN \ -DWIN32_LEAN_AND_MEAN \
-D_UNICODE \
-UNOMINMAX \ -UNOMINMAX \
)) ))
shell/Library_shlxthdl_x64.mk
-2
View File
@@ -22,9 +22,7 @@ $(eval $(call gb_Library_set_include,shlxthdl_x64,\
$(eval $(call gb_Library_add_defs,shlxthdl_x64,\ $(eval $(call gb_Library_add_defs,shlxthdl_x64,\
-DISOLATION_AWARE_ENABLED \ -DISOLATION_AWARE_ENABLED \
-DUNICODE \
-DWIN32_LEAN_AND_MEAN \ -DWIN32_LEAN_AND_MEAN \
-D_UNICODE \
-UNOMINMAX \ -UNOMINMAX \
)) ))
shell/Library_spsupp.mk
-5
View File
@@ -18,11 +18,6 @@ $(eval $(call gb_Library_set_include,spsupp,\
$$(INCLUDE) \ $$(INCLUDE) \
)) ))
$(eval $(call gb_Library_add_defs,spsupp,\
-DUNICODE \
-D_UNICODE \
))
$(eval $(call gb_Library_use_system_win32_libs,spsupp,\ $(eval $(call gb_Library_use_system_win32_libs,spsupp,\
advapi32 \ advapi32 \
kernel32 \ kernel32 \
shell/Library_spsupp_x64.mk
-5
View File
@@ -21,11 +21,6 @@ $(eval $(call gb_Library_set_include,spsupp_x64,\
$$(INCLUDE) \ $$(INCLUDE) \
)) ))
$(eval $(call gb_Library_add_defs,spsupp_x64,\
-DUNICODE \
-D_UNICODE \
))
$(eval $(call gb_Library_use_system_win32_libs,spsupp_x64,\ $(eval $(call gb_Library_use_system_win32_libs,spsupp_x64,\
advapi32 \ advapi32 \
kernel32 \ kernel32 \
shell/StaticLibrary_shlxthandler_common.mk
-2
View File
@@ -16,9 +16,7 @@ $(eval $(call gb_StaticLibrary_set_include,shlxthandler_common,\
$(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common,\ $(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common,\
-DISOLATION_AWARE_ENABLED \ -DISOLATION_AWARE_ENABLED \
-DUNICODE \
-DWIN32_LEAN_AND_MEAN \ -DWIN32_LEAN_AND_MEAN \
-D_UNICODE \
)) ))
$(eval $(call gb_StaticLibrary_use_externals,shlxthandler_common,\ $(eval $(call gb_StaticLibrary_use_externals,shlxthandler_common,\
shell/StaticLibrary_shlxthandler_common_x64.mk
-2
View File
@@ -22,9 +22,7 @@ $(eval $(call gb_StaticLibrary_set_include,shlxthandler_common_x64,\
$(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common_x64,\ $(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common_x64,\
-DISOLATION_AWARE_ENABLED \ -DISOLATION_AWARE_ENABLED \
-DUNICODE \
-DWIN32_LEAN_AND_MEAN \ -DWIN32_LEAN_AND_MEAN \
-D_UNICODE \
)) ))
$(eval $(call gb_StaticLibrary_use_externals,shlxthandler_common_x64,\ $(eval $(call gb_StaticLibrary_use_externals,shlxthandler_common_x64,\
winaccessibility/Library_uacccom.mk
-2
View File
@@ -21,8 +21,6 @@ $(eval $(call gb_Library_set_include,UAccCOM,\
$(eval $(call gb_Library_add_defs,UAccCOM,\ $(eval $(call gb_Library_add_defs,UAccCOM,\
-DUACCCOM_DLLIMPLEMENTATION \ -DUACCCOM_DLLIMPLEMENTATION \
-D_UNICODE \
-DUNICODE \
)) ))
$(eval $(call gb_Library_use_sdk_api,UAccCOM)) $(eval $(call gb_Library_use_sdk_api,UAccCOM))