Kaydet (Commit) 58116022 authored tarafından Thomas Arnhold's avatar Thomas Arnhold

windows: remove _CRTIMP and _NTSDK definitions

Those have no effects with current windows SDKs.

Change-Id: I6fb2f8045fe1fc0ed4beef51dde487b7a7dfdc28
üst 5084e2b3
...@@ -17,12 +17,6 @@ ...@@ -17,12 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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 <algorithm>
#include <new> #include <new>
#include <string.h> #include <string.h>
......
...@@ -9,10 +9,6 @@ ...@@ -9,10 +9,6 @@
$(eval $(call gb_Executable_Executable,lngconvex)) $(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_external,lngconvex,boost_headers))
$(eval $(call gb_Executable_use_sdk_api,lngconvex)) $(eval $(call gb_Executable_use_sdk_api,lngconvex))
......
...@@ -18,7 +18,6 @@ $(eval $(call gb_Library_add_defs,ooofilt,\ ...@@ -18,7 +18,6 @@ $(eval $(call gb_Library_add_defs,ooofilt,\
-DISOLATION_AWARE_ENABLED \ -DISOLATION_AWARE_ENABLED \
-DUNICODE \ -DUNICODE \
-DWIN32_LEAN_AND_MEAN \ -DWIN32_LEAN_AND_MEAN \
-D_NTSDK \
-D_UNICODE \ -D_UNICODE \
)) ))
$(eval $(call gb_Library_add_defs,ooofilt,\ $(eval $(call gb_Library_add_defs,ooofilt,\
......
...@@ -24,7 +24,6 @@ $(eval $(call gb_Library_add_defs,ooofilt_x64,\ ...@@ -24,7 +24,6 @@ $(eval $(call gb_Library_add_defs,ooofilt_x64,\
-DISOLATION_AWARE_ENABLED \ -DISOLATION_AWARE_ENABLED \
-DUNICODE \ -DUNICODE \
-DWIN32_LEAN_AND_MEAN \ -DWIN32_LEAN_AND_MEAN \
-D_NTSDK \
-D_UNICODE \ -D_UNICODE \
-UNOMINMAX \ -UNOMINMAX \
)) ))
......
...@@ -18,7 +18,6 @@ $(eval $(call gb_Library_add_defs,propertyhdl,\ ...@@ -18,7 +18,6 @@ $(eval $(call gb_Library_add_defs,propertyhdl,\
-DISOLATION_AWARE_ENABLED \ -DISOLATION_AWARE_ENABLED \
-DUNICODE \ -DUNICODE \
-DWIN32_LEAN_AND_MEAN \ -DWIN32_LEAN_AND_MEAN \
-D_NTSDK \
-D_UNICODE \ -D_UNICODE \
-UNOMINMAX \ -UNOMINMAX \
)) ))
......
...@@ -24,7 +24,6 @@ $(eval $(call gb_Library_add_defs,propertyhdl_x64,\ ...@@ -24,7 +24,6 @@ $(eval $(call gb_Library_add_defs,propertyhdl_x64,\
-DISOLATION_AWARE_ENABLED \ -DISOLATION_AWARE_ENABLED \
-DUNICODE \ -DUNICODE \
-DWIN32_LEAN_AND_MEAN \ -DWIN32_LEAN_AND_MEAN \
-D_NTSDK \
-D_UNICODE \ -D_UNICODE \
-UNOMINMAX \ -UNOMINMAX \
)) ))
......
...@@ -18,7 +18,6 @@ $(eval $(call gb_Library_add_defs,shlxthdl,\ ...@@ -18,7 +18,6 @@ $(eval $(call gb_Library_add_defs,shlxthdl,\
-DISOLATION_AWARE_ENABLED \ -DISOLATION_AWARE_ENABLED \
-DUNICODE \ -DUNICODE \
-DWIN32_LEAN_AND_MEAN \ -DWIN32_LEAN_AND_MEAN \
-D_NTSDK \
-D_UNICODE \ -D_UNICODE \
-UNOMINMAX \ -UNOMINMAX \
)) ))
......
...@@ -24,7 +24,6 @@ $(eval $(call gb_Library_add_defs,shlxthdl_x64,\ ...@@ -24,7 +24,6 @@ $(eval $(call gb_Library_add_defs,shlxthdl_x64,\
-DISOLATION_AWARE_ENABLED \ -DISOLATION_AWARE_ENABLED \
-DUNICODE \ -DUNICODE \
-DWIN32_LEAN_AND_MEAN \ -DWIN32_LEAN_AND_MEAN \
-D_NTSDK \
-D_UNICODE \ -D_UNICODE \
-UNOMINMAX \ -UNOMINMAX \
)) ))
......
...@@ -18,7 +18,6 @@ $(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common,\ ...@@ -18,7 +18,6 @@ $(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common,\
-DISOLATION_AWARE_ENABLED \ -DISOLATION_AWARE_ENABLED \
-DUNICODE \ -DUNICODE \
-DWIN32_LEAN_AND_MEAN \ -DWIN32_LEAN_AND_MEAN \
-D_NTSDK \
-D_UNICODE \ -D_UNICODE \
)) ))
$(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common,\ $(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common,\
......
...@@ -24,7 +24,6 @@ $(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common_x64,\ ...@@ -24,7 +24,6 @@ $(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common_x64,\
-DISOLATION_AWARE_ENABLED \ -DISOLATION_AWARE_ENABLED \
-DUNICODE \ -DUNICODE \
-DWIN32_LEAN_AND_MEAN \ -DWIN32_LEAN_AND_MEAN \
-D_NTSDK \
-D_UNICODE \ -D_UNICODE \
)) ))
$(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common_x64,\ $(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common_x64,\
......
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