- Remove __USE_W32API support.

- Add definition of _ttoi64.

svn path=/trunk/; revision=12842

diff --git a/reactos/include/tchar.h b/reactos/include/tchar.h
index 370a97c..cf296e3 100644 (file)
--- a/reactos/include/tchar.h
+++ b/reactos/include/tchar.h
@@ -38,12 +38,6 @@
 #ifndef        _ROS_TCHAR_H_
 #define _ROS_TCHAR_H_
 
-#ifdef __USE_W32API
-
-#include_next <tchar.h>
-
-#else
-
 #include <msvcrt/string.h>
 
 /*
@@ -154,6 +148,7 @@ typedef wchar_t TCHAR;
 #define        _totupper       towupper
 #define        _totlower       towlower
 #define        _ttoi           _wtoi
+#define        _ttoi64         _wtoi64
 #define        _tcsftime       wcsftime
 #define        _tsplitpath     _wsplitpath
 #define        _tmakepath      _wmakepath
@@ -262,6 +257,7 @@ typedef char TCHAR;
 #define _totupper      toupper
 #define        _totlower       tolower
 #define        _ttoi           atoi
+#define        _ttoi64         _atoi64
 #define _tcsftime      strftime
 #define        _tsplitpath     _splitpath
 #define        _tmakepath      _makepath
@@ -269,6 +265,4 @@ typedef char TCHAR;
 
 #endif /* Not _UNICODE */
 
-#endif  /* Not __USE_W32API */
-
 #endif /* Not _TCHAR_H_ */