diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2013-11-05 09:27:46 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2013-11-05 09:28:55 +0100 |
| commit | 581160228741358f4768ac6f25023a7887efb5f7 (patch) | |
| tree | 538d1192d70d88b69c5b241961e4b35cd41d61f1 | |
| parent | 5084e2b313ef4c4a126f704e1d5397f20a3d4254 (diff) | |
windows: remove _CRTIMP and _NTSDK definitions
Those have no effects with current windows SDKs.
Change-Id: I6fb2f8045fe1fc0ed4beef51dde487b7a7dfdc28
| -rw-r--r-- | sal/cpprt/operators_new_delete.cxx | 6 | ||||
| -rw-r--r-- | shell/Executable_lngconvex.mk | 4 | ||||
| -rw-r--r-- | shell/Library_ooofilt.mk | 1 | ||||
| -rw-r--r-- | shell/Library_ooofilt_x64.mk | 1 | ||||
| -rw-r--r-- | shell/Library_propertyhdl.mk | 1 | ||||
| -rw-r--r-- | shell/Library_propertyhdl_x64.mk | 1 | ||||
| -rw-r--r-- | shell/Library_shlxthdl.mk | 1 | ||||
| -rw-r--r-- | shell/Library_shlxthdl_x64.mk | 1 | ||||
| -rw-r--r-- | shell/StaticLibrary_shlxthandler_common.mk | 1 | ||||
| -rw-r--r-- | shell/StaticLibrary_shlxthandler_common_x64.mk | 1 |
10 files changed, 0 insertions, 18 deletions
diff --git a/sal/cpprt/operators_new_delete.cxx b/sal/cpprt/operators_new_delete.cxx index 2b53ffac6119..71abf0071932 100644 --- a/sal/cpprt/operators_new_delete.cxx +++ b/sal/cpprt/operators_new_delete.cxx @@ -17,12 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -#ifdef _MSC_VER /* avoid 'std::bad_alloc' unresolved externals */ -#define _CRTIMP -#define _NTSDK -#endif - #include <algorithm> #include <new> #include <string.h> diff --git a/shell/Executable_lngconvex.mk b/shell/Executable_lngconvex.mk index 220f872596da..e3ca7e6a4566 100644 --- a/shell/Executable_lngconvex.mk +++ b/shell/Executable_lngconvex.mk @@ -9,10 +9,6 @@ $(eval $(call gb_Executable_Executable,lngconvex)) -$(eval $(call gb_Executable_add_defs,lngconvex,\ - -D_NTSDK \ -)) - $(eval $(call gb_Executable_use_external,lngconvex,boost_headers)) $(eval $(call gb_Executable_use_sdk_api,lngconvex)) diff --git a/shell/Library_ooofilt.mk b/shell/Library_ooofilt.mk index d225deb5dcbe..d8f68b05fe84 100644 --- a/shell/Library_ooofilt.mk +++ b/shell/Library_ooofilt.mk @@ -18,7 +18,6 @@ $(eval $(call gb_Library_add_defs,ooofilt,\ -DISOLATION_AWARE_ENABLED \ -DUNICODE \ -DWIN32_LEAN_AND_MEAN \ - -D_NTSDK \ -D_UNICODE \ )) $(eval $(call gb_Library_add_defs,ooofilt,\ diff --git a/shell/Library_ooofilt_x64.mk b/shell/Library_ooofilt_x64.mk index cf12f73c03cf..c32a51261637 100644 --- a/shell/Library_ooofilt_x64.mk +++ b/shell/Library_ooofilt_x64.mk @@ -24,7 +24,6 @@ $(eval $(call gb_Library_add_defs,ooofilt_x64,\ -DISOLATION_AWARE_ENABLED \ -DUNICODE \ -DWIN32_LEAN_AND_MEAN \ - -D_NTSDK \ -D_UNICODE \ -UNOMINMAX \ )) diff --git a/shell/Library_propertyhdl.mk b/shell/Library_propertyhdl.mk index 36bc9f74a956..70b2763225fe 100644 --- a/shell/Library_propertyhdl.mk +++ b/shell/Library_propertyhdl.mk @@ -18,7 +18,6 @@ $(eval $(call gb_Library_add_defs,propertyhdl,\ -DISOLATION_AWARE_ENABLED \ -DUNICODE \ -DWIN32_LEAN_AND_MEAN \ - -D_NTSDK \ -D_UNICODE \ -UNOMINMAX \ )) diff --git a/shell/Library_propertyhdl_x64.mk b/shell/Library_propertyhdl_x64.mk index 72a9b5136b47..d73126a755ec 100644 --- a/shell/Library_propertyhdl_x64.mk +++ b/shell/Library_propertyhdl_x64.mk @@ -24,7 +24,6 @@ $(eval $(call gb_Library_add_defs,propertyhdl_x64,\ -DISOLATION_AWARE_ENABLED \ -DUNICODE \ -DWIN32_LEAN_AND_MEAN \ - -D_NTSDK \ -D_UNICODE \ -UNOMINMAX \ )) diff --git a/shell/Library_shlxthdl.mk b/shell/Library_shlxthdl.mk index a19de73b4f13..9cd0ceae50b3 100644 --- a/shell/Library_shlxthdl.mk +++ b/shell/Library_shlxthdl.mk @@ -18,7 +18,6 @@ $(eval $(call gb_Library_add_defs,shlxthdl,\ -DISOLATION_AWARE_ENABLED \ -DUNICODE \ -DWIN32_LEAN_AND_MEAN \ - -D_NTSDK \ -D_UNICODE \ -UNOMINMAX \ )) diff --git a/shell/Library_shlxthdl_x64.mk b/shell/Library_shlxthdl_x64.mk index 595263f06920..eef8081f48ed 100644 --- a/shell/Library_shlxthdl_x64.mk +++ b/shell/Library_shlxthdl_x64.mk @@ -24,7 +24,6 @@ $(eval $(call gb_Library_add_defs,shlxthdl_x64,\ -DISOLATION_AWARE_ENABLED \ -DUNICODE \ -DWIN32_LEAN_AND_MEAN \ - -D_NTSDK \ -D_UNICODE \ -UNOMINMAX \ )) diff --git a/shell/StaticLibrary_shlxthandler_common.mk b/shell/StaticLibrary_shlxthandler_common.mk index d2c9c8df5b22..1114b6a16fc0 100644 --- a/shell/StaticLibrary_shlxthandler_common.mk +++ b/shell/StaticLibrary_shlxthandler_common.mk @@ -18,7 +18,6 @@ $(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common,\ -DISOLATION_AWARE_ENABLED \ -DUNICODE \ -DWIN32_LEAN_AND_MEAN \ - -D_NTSDK \ -D_UNICODE \ )) $(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common,\ diff --git a/shell/StaticLibrary_shlxthandler_common_x64.mk b/shell/StaticLibrary_shlxthandler_common_x64.mk index 17d601424310..106c9c572430 100644 --- a/shell/StaticLibrary_shlxthandler_common_x64.mk +++ b/shell/StaticLibrary_shlxthandler_common_x64.mk @@ -24,7 +24,6 @@ $(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common_x64,\ -DISOLATION_AWARE_ENABLED \ -DUNICODE \ -DWIN32_LEAN_AND_MEAN \ - -D_NTSDK \ -D_UNICODE \ )) $(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common_x64,\ |