[ros-diffs] [tkreuzer] 50212: [STLPORT] - Fix compilation with 64 bit gcc

tkreuzer at svn.reactos.org tkreuzer at svn.reactos.org
Wed Dec 29 11:45:57 UTC 2010


Author: tkreuzer
Date: Wed Dec 29 11:45:57 2010
New Revision: 50212

URL: http://svn.reactos.org/svn/reactos?rev=50212&view=rev
Log:
[STLPORT]
- Fix compilation with 64 bit gcc

Modified:
    branches/cmake-bringup/include/c++/stlport/stl/_num_put.c

Modified: branches/cmake-bringup/include/c++/stlport/stl/_num_put.c
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/c%2B%2B/stlport/stl/_num_put.c?rev=50212&r1=50211&r2=50212&view=diff
==============================================================================
--- branches/cmake-bringup/include/c++/stlport/stl/_num_put.c [iso-8859-1] (original)
+++ branches/cmake-bringup/include/c++/stlport/stl/_num_put.c [iso-8859-1] Wed Dec 29 11:45:57 2010
@@ -497,6 +497,9 @@
 #  pragma warning (disable : 4311) //pointer truncation from 'const void*' to 'unsigned long'
 #endif
   _OutputIter result =
+#ifdef _WIN64 // ReactOS, compilation with 64 bit gcc
+_STLP_PRIV __do_put_integer(__s, __f, __c_type.widen('0'), __REINTERPRET_CAST(unsigned _STLP_LONG_LONG,__val));
+#else
 #ifdef _STLP_LONG_LONG
     ( sizeof(void*) == sizeof(unsigned long) ) ?
 #endif
@@ -506,6 +509,7 @@
     _STLP_PRIV __do_put_integer(__s, __f, __c_type.widen('0'), __REINTERPRET_CAST(unsigned _STLP_LONG_LONG,__val))
 #endif
         ;
+#endif
 #if defined (_STLP_MSVC)
 #  pragma warning (pop)
 #endif




More information about the Ros-diffs mailing list