[sserapion] 36177: Remove hacks. Add hacks. Zero sum game?

Author: sserapion
Date: Sat Sep 13 02:13:27 2008
New Revision: 36177

URL: http://svn.reactos.org/svn/reactos?rev=36177&view=rev
Log:
Remove hacks. Add hacks. Zero sum game?

Modified:
    branches/ros-amd64-bringup/reactos/include/crt/_mingw.h
    branches/ros-amd64-bringup/reactos/include/crt/stdlib.h
    branches/ros-amd64-bringup/reactos/include/crt/wchar.h

Modified: branches/ros-amd64-bringup/reactos/include/crt/_mingw.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/includ...
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/crt/_mingw.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/crt/_mingw.h [iso-8859-1] Sat Sep 13 02:13:27 2008
@@ -272,14 +272,12 @@
 #define _SIZE_T_DEFINED
 #undef size_t
 #ifdef _WIN64
-#define _INTEGRAL_MAX_BITS 64
 #if defined(__GNUC__) && defined(__STRICT_ANSI__)
   typedef unsigned int size_t __attribute__ ((mode (DI)));
 #else
   typedef unsigned __int64 size_t;
 #endif
 #else
-  #define _INTEGRAL_MAX_BITS 32
   typedef unsigned int size_t;
 #endif
 #endif

Modified: branches/ros-amd64-bringup/reactos/include/crt/stdlib.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/includ...
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/crt/stdlib.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/crt/stdlib.h [iso-8859-1] Sat Sep 13 02:13:27 2008
@@ -562,7 +562,7 @@
   char *__cdecl ulltoa (unsigned long long , char *, int);
   wchar_t *__cdecl lltow (long long, wchar_t *, int);
   wchar_t *__cdecl ulltow (unsigned long long, wchar_t *, int);
-
+#if _INTEGRAL_MAX_BITS >= 64
   /* __CRT_INLINE using non-ansi functions */
   __CRT_INLINE long long  __cdecl atoll (const char * _c) { return _atoi64 (_c); }
   __CRT_INLINE char *__cdecl lltoa (long long _n, char * _c, int _i) { return _i64toa (_n, _c, _i); }
@@ -571,7 +571,7 @@
   __CRT_INLINE wchar_t *__cdecl lltow (long long _n, wchar_t * _w, int _i) { return _i64tow (_n, _w, _i); }
   __CRT_INLINE wchar_t *__cdecl ulltow (unsigned long long _n, wchar_t * _w, int _i) { return _ui64tow (_n, _w, _i); }
 #endif /* (__STRICT_ANSI__)  */
-
+#endif
 #endif /* !__NO_ISOCEXT */

#ifdef __cplusplus

Modified: branches/ros-amd64-bringup/reactos/include/crt/wchar.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/includ...
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/crt/wchar.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/crt/wchar.h [iso-8859-1] Sat Sep 13 02:13:27 2008
@@ -89,6 +89,8 @@
     wchar_t name[260];
   };

+/* #if _INTEGRAL_MAX_BITS >= 64 */
+
   struct _wfinddata32i64_t {
     unsigned attrib;
     __time32_t time_create;
@@ -115,8 +117,9 @@
     __int64 size;
     wchar_t name[260];
   };
-
-#if !defined(_WIN64) //defined(_USE_32BIT_TIME_T)
+/* #endif */
+
+#ifdef _USE_32BIT_TIME_T
 #define _wfinddata_t _wfinddata32_t
 #define _wfinddatai64_t _wfinddata32i64_t

@@ -454,7 +457,7 @@
   };
 #endif

-#if _INTEGRAL_MAX_BITS >= 64
+/* #if _INTEGRAL_MAX_BITS >= 64 */

struct _stat32i64 {
     _dev_t st_dev;
@@ -497,7 +500,7 @@
     __time64_t st_mtime;
     __time64_t st_ctime;
   };
-#endif
+/* #endif */

#define __stat64 _stat64