Kaydet (Commit) 558956dc authored tarafından Mike Kaganski's avatar Mike Kaganski

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/70237Reviewed-by: 's avatarMichael Stahl <Michael.Stahl@cib.de>
Reviewed-by: 's avatarMike Kaganski <mike.kaganski@collabora.com>
Tested-by: 's avatarMike Kaganski <mike.kaganski@collabora.com>
üst 50580f45
......@@ -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 \
))
......
......@@ -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,\
......
......@@ -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 \
))
......
......@@ -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 \
))
......
......@@ -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 \
))
......
......@@ -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 \
))
......
......@@ -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 \
))
......
......@@ -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 \
))
......
......@@ -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 \
))
......
......@@ -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 \
))
......
......@@ -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 \
......
......@@ -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 \
......
......@@ -33,7 +33,6 @@ $(eval $(call gb_Executable_use_externals,mar,\
))
$(eval $(call gb_Executable_add_defs,mar,\
-DUNICODE \
-DMAR_NSS \
))
......
......@@ -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 \
))
......
......@@ -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,\
......
......@@ -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 \
))
......
......@@ -50,7 +50,6 @@ $(eval $(call gb_Executable_add_ldflags,updater,\
$(eval $(call gb_Executable_add_defs,updater,\
-DVERIFY_MAR_SIGNATURE \
-DUNICODE \
))
else
......
......@@ -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 \
......
......@@ -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 \
))
......
......@@ -16,7 +16,6 @@ $(eval $(call gb_StaticLibrary_set_include,updatehelper,\
))
$(eval $(call gb_StaticLibrary_add_defs,updatehelper,\
-DUNICODE \
-DNSS3 \
-DVERIFY_MAR_SIGNATURE \
))
......
......@@ -10,8 +10,6 @@
$(eval $(call gb_Library_Library,reg4allmsdoc))
$(eval $(call gb_Library_add_defs,reg4allmsdoc,\
-DUNICODE \
-D_UNICODE \
-U_DLL \
))
......
......@@ -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 \
))
......
......@@ -10,8 +10,6 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,quickstarter))
$(eval $(call gb_StaticLibrary_add_defs,quickstarter,\
-DUNICODE \
-D_UNICODE \
-U_DLL \
))
......
......@@ -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 \
))
......
......@@ -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 \
))
......
......@@ -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 \
))
......
......@@ -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 \
))
......
......@@ -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 \
))
......
......@@ -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 \
))
......
......@@ -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 \
......
......@@ -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 \
......
......@@ -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,\
......
......@@ -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,\
......
......@@ -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))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment