[ros-diffs] [jgardou] 51273: [CMAKE] We provide everything (headers, libraries, executables...), so tell it to cmake [CRT] The crt library must provide a and w version of the functions and not rely to _UNICODE...

[jgardou]

Author: jgardou
Date: Thu Apr  7 14:11:36 2011
New Revision: 51273

URL: http://svn.reactos.org/svn/reactos?rev=51273&view=rev
Log:
[CMAKE]
We provide everything (headers, libraries, executables...), so tell it to cmake
[CRT]
The crt library must provide a and w version of the functions and not rely to 
_UNICODE being set or not

Modified:
    branches/cmake-bringup/CMakeLists.txt
    branches/cmake-bringup/lib/sdk/crt/string/atol.c

Modified: branches/cmake-bringup/CMakeLists.txt
URL: 
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?rev=51273&r1=51272&r2=51273&view=diff
==============================================================================
--- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Thu Apr  7 14:11:36 2011
@@ -69,8 +69,8 @@
     # search headers and libraries in the target environment, search
     # programs in the host environment
     set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-    set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-    set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+    set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY NEVER)
+    set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER)
 
     # Do some cleanup
     file(REMOVE

Modified: branches/cmake-bringup/lib/sdk/crt/string/atol.c
URL: 
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/string/atol.c?rev=51273&r1=51272&r2=51273&view=diff
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/string/atol.c [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/string/atol.c [iso-8859-1] Thu Apr  7 
14:11:36 2011
@@ -1,14 +1,17 @@
 /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
 #include <stdlib.h>
-#include <tchar.h>
 
 /*
  * @implemented
  */
-long
-_ttol(const _TCHAR *str)
+long atol(const char *str)
 {
-  return (long)_ttoi64(str);
+    return (long)_atoi64(str);
+}
+
+long _wtol(const wchar_t *str)
+{
+    return (long)_wtoi64(str);
 }
 
 int _atoldbl(_LDOUBLE *value, char *str)
@@ -16,4 +19,4 @@
     /* FIXME needs error checking for huge/small values */
    //*value = strtold(str,0);
    return -1;
-}
+}