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>

8 files changed, 1 insertions, 24 deletions

diff --git a/onlineupdate/Executable_mar.mk b/onlineupdate/Executable_mar.mk
index 2c8adc47c15d..5352f4ac2761 100644
--- 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 \
 ))
 
diff --git a/onlineupdate/Executable_mbsdiff.mk b/onlineupdate/Executable_mbsdiff.mk
index e5a49b5ac747..9c528a58b9ff 100644
--- 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 \
 ))
diff --git a/onlineupdate/Executable_test_updater_dialog.mk b/onlineupdate/Executable_test_updater_dialog.mk
index 92e70dfae337..877f380eb71c 100644
--- 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,\
diff --git a/onlineupdate/Executable_update_service.mk b/onlineupdate/Executable_update_service.mk
index 1ce5c9fb3efd..edd02f6ecf96 100644
--- 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 \
 ))
diff --git a/onlineupdate/Executable_updater.mk b/onlineupdate/Executable_updater.mk
index a4ceacee6bc1..9860e3cf38ef 100644
--- 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
diff --git a/onlineupdate/StaticLibrary_libmar.mk b/onlineupdate/StaticLibrary_libmar.mk
index 1e0fc605566d..9b82e726a21d 100644
--- 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 \
diff --git a/onlineupdate/StaticLibrary_libmarverify.mk b/onlineupdate/StaticLibrary_libmarverify.mk
index fe866204f4ee..41ac492a7b63 100644
--- 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 \
 ))
diff --git a/onlineupdate/StaticLibrary_updatehelper.mk b/onlineupdate/StaticLibrary_updatehelper.mk
index ab6b4edf77e1..1c3654cbc864 100644
--- 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 \
 ))