[ros-diffs] [tkreuzer] 70425: [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 CO...

Author: tkreuzer
Date: Sat Dec 26 17:13:08 2015
New Revision: 70425

URL: http://svn.reactos.org/svn/reactos?rev=70425&view=rev
Log:
[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

Modified:
    trunk/reactos/dll/win32/msvcrt/dllmain.c
    trunk/reactos/lib/sdk/crt/crt.cmake

Modified: trunk/reactos/dll/win32/msvcrt/dllmain.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/dllmain.c…
==============================================================================
--- trunk/reactos/dll/win32/msvcrt/dllmain.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msvcrt/dllmain.c	[iso-8859-1] Sat Dec 26 17:13:08 2015
@@ -125,4 +125,18 @@
     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 */

Modified: trunk/reactos/lib/sdk/crt/crt.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.cmake?rev=…
==============================================================================
--- trunk/reactos/lib/sdk/crt/crt.cmake	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/crt.cmake	[iso-8859-1] Sat Dec 26 17:13:08 2015
@@ -34,6 +34,7 @@
     float/nafter.c
     float/scalb.c
     locale/locale.c
+    math/abs.c
     math/acos.c
     math/adjust.c
     math/asin.c
@@ -51,6 +52,7 @@
     math/j0_y0.c
     math/j1_y1.c
     math/jn_yn.c
+    math/labs.c
     math/ldiv.c
     math/logf.c
     math/modf.c