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>

9 files changed, 0 insertions, 36 deletions

diff --git a/desktop/Executable_minidump_upload.mk b/desktop/Executable_minidump_upload.mk
index 959d4af8c7c1..ccdcc97e743d 100644
--- 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,\
diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk
index 4dd6be02a9ee..d3a4fafea810 100644
--- 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 \
 ))
diff --git a/desktop/Executable_scalc.mk b/desktop/Executable_scalc.mk
index fc066770b945..1a21840a3306 100644
--- 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 \
 ))
diff --git a/desktop/Executable_sdraw.mk b/desktop/Executable_sdraw.mk
index 1b12bb0f2467..c6fd96373de1 100644
--- 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 \
 ))
diff --git a/desktop/Executable_simpress.mk b/desktop/Executable_simpress.mk
index 7376b7bd3883..d06205486020 100644
--- 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 \
 ))
diff --git a/desktop/Executable_smath.mk b/desktop/Executable_smath.mk
index 249f62223bfe..94aa8b915f30 100644
--- 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 \
 ))
diff --git a/desktop/Executable_sweb.mk b/desktop/Executable_sweb.mk
index 0bbc83877742..72cd6357be8f 100644
--- 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 \
 ))
diff --git a/desktop/Executable_swriter.mk b/desktop/Executable_swriter.mk
index 6fbf9bd5057c..3f4859e23b88 100644
--- 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 \
 ))
diff --git a/desktop/StaticLibrary_winlauncher.mk b/desktop/StaticLibrary_winlauncher.mk
index 46bed0de4c90..1fed934f1ba2 100644
--- 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 \
 ))