diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2019-04-03 14:10:16 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2019-04-04 13:57:59 +0200 |
| commit | 558956dc811a1f0f07411e348f7081a467bbc3b5 (patch) | |
| tree | 0c468ce4b9f0773478b4a2733282c0c0aea81ae2 /shell | |
| parent | 50580f452cc7c88a231831619a3f05958ce56460 (diff) | |
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>
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/Library_ooofilt.mk | 2 | ||||
| -rw-r--r-- | shell/Library_ooofilt_x64.mk | 2 | ||||
| -rw-r--r-- | shell/Library_propertyhdl.mk | 2 | ||||
| -rw-r--r-- | shell/Library_propertyhdl_x64.mk | 2 | ||||
| -rw-r--r-- | shell/Library_shlxthdl.mk | 2 | ||||
| -rw-r--r-- | shell/Library_shlxthdl_x64.mk | 2 | ||||
| -rw-r--r-- | shell/Library_spsupp.mk | 5 | ||||
| -rw-r--r-- | shell/Library_spsupp_x64.mk | 5 | ||||
| -rw-r--r-- | shell/StaticLibrary_shlxthandler_common.mk | 2 | ||||
| -rw-r--r-- | shell/StaticLibrary_shlxthandler_common_x64.mk | 2 |
10 files changed, 0 insertions, 26 deletions
diff --git a/shell/Library_ooofilt.mk b/shell/Library_ooofilt.mk index dafee1032bb6..f8b4361a12cc 100644 --- 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 \ )) diff --git a/shell/Library_ooofilt_x64.mk b/shell/Library_ooofilt_x64.mk index a9f4cd5b1be0..a09f89214f48 100644 --- 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 \ )) diff --git a/shell/Library_propertyhdl.mk b/shell/Library_propertyhdl.mk index 148b2eab94fc..c0565b2d9f37 100644 --- 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 \ )) diff --git a/shell/Library_propertyhdl_x64.mk b/shell/Library_propertyhdl_x64.mk index 9599b3d30310..5736f2152a11 100644 --- 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 \ )) diff --git a/shell/Library_shlxthdl.mk b/shell/Library_shlxthdl.mk index be4b67e949ee..4207c76037b1 100644 --- 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 \ )) diff --git a/shell/Library_shlxthdl_x64.mk b/shell/Library_shlxthdl_x64.mk index fb49fa0d0363..3501d46c3239 100644 --- 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 \ )) diff --git a/shell/Library_spsupp.mk b/shell/Library_spsupp.mk index fd9bdba84351..1963bbfaebda 100644 --- 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 \ diff --git a/shell/Library_spsupp_x64.mk b/shell/Library_spsupp_x64.mk index 4b29f27e31d2..cbb69df7d352 100644 --- 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 \ diff --git a/shell/StaticLibrary_shlxthandler_common.mk b/shell/StaticLibrary_shlxthandler_common.mk index 553418d37b2f..f19c942eabc8 100644 --- 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,\ diff --git a/shell/StaticLibrary_shlxthandler_common_x64.mk b/shell/StaticLibrary_shlxthandler_common_x64.mk index 94704381ca23..2f906c516e68 100644 --- 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,\ |