[CRT] Add abs and labs to CRT lib

[MSVCRT] Explicitly pull in _vsnprintf, bsearch and strcspn from CRT, to prevent the MS linker from exporting stubs from libntdll instead.
See CORE-10753

svn path=/trunk/; revision=70425

diff --git a/reactos/dll/win32/msvcrt/dllmain.c b/reactos/dll/win32/msvcrt/dllmain.c
index 1576a92..c34f071 100644 (file)
--- a/reactos/dll/win32/msvcrt/dllmain.c
+++ b/reactos/dll/win32/msvcrt/dllmain.c
@@ -125,4 +125,18 @@ DllMain(PVOID hinstDll, ULONG dwReason, PVOID reserved)
     return TRUE;
 }
 
     return TRUE;
 }
 

+/* FIXME: This hack is required to prevent the VC linker from linking these
+   exports to the functions from libntdll. See CORE-10753 */
+#ifdef _MSC_VER
+#ifdef _M_IX86
+#pragma comment(linker, "/include:__vsnprintf")
+#pragma comment(linker, "/include:_bsearch")
+#pragma comment(linker, "/include:_strcspn")
+#else
+#pragma comment(linker, "/include:_vsnprintf")
+#pragma comment(linker, "/include:bsearch")
+#pragma comment(linker, "/include:strcspn")
+#endif // _M_IX86
+#endif // _MSC_VER
+

 /* EOF */
 /* EOF */

diff --git a/reactos/lib/sdk/crt/crt.cmake b/reactos/lib/sdk/crt/crt.cmake
index bee453d..ba65bd4 100644 (file)
--- a/reactos/lib/sdk/crt/crt.cmake
+++ b/reactos/lib/sdk/crt/crt.cmake
@@ -34,6 +34,7 @@ list(APPEND CRT_SOURCE
     float/nafter.c
     float/scalb.c
     locale/locale.c
     float/nafter.c
     float/scalb.c
     locale/locale.c

+    math/abs.c

     math/acos.c
     math/adjust.c
     math/asin.c
     math/acos.c
     math/adjust.c
     math/asin.c


@@ -51,6 +52,7 @@ list(APPEND CRT_SOURCE
     math/j0_y0.c
     math/j1_y1.c
     math/jn_yn.c
     math/j0_y0.c
     math/j1_y1.c
     math/jn_yn.c

+    math/labs.c

     math/ldiv.c
     math/logf.c
     math/modf.c
     math/ldiv.c
     math/logf.c
     math/modf.c