[ros-diffs] [tkreuzer] 53428: [INTRIN] Fix _bittest64 prototype [STLPORT] Fix amd64 build of modules using these headers

Author: tkreuzer
Date: Wed Aug 24 22:02:41 2011
New Revision: 53428

URL: http://svn.reactos.org/svn/reactos?rev=53428&view=rev
Log:
[INTRIN] Fix _bittest64 prototype
[STLPORT] Fix amd64 build of modules using these headers

Modified:
    trunk/reactos/include/c++/stlport/stl/config/_reactos.h
    trunk/reactos/include/crt/msc/intrin.h
    trunk/reactos/lib/3rdparty/stlport/CMakeLists.txt

Modified: trunk/reactos/include/c++/stlport/stl/config/_reactos.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/c%2B%2B/stlport/st…
==============================================================================
--- trunk/reactos/include/c++/stlport/stl/config/_reactos.h [iso-8859-1] (original)
+++ trunk/reactos/include/c++/stlport/stl/config/_reactos.h [iso-8859-1] Wed Aug 24
22:02:41 2011
@@ -313,8 +313,11 @@
 #ifdef __cplusplus
 }
 #endif
+
+#ifdef _BUILD_STLPORT
 #define InterlockedPopEntrySList(list)
reinterpret_cast<_STLP_atomic_freelist::item*>(InterlockedPopEntrySList(list))
 #define InterlockedFlushSList(list)
reinterpret_cast<_STLP_atomic_freelist::item*>(InterlockedFlushSList(list))
+#endif
 
 #undef __cdecl__
 #define __cdecl__

Modified: trunk/reactos/include/crt/msc/intrin.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/msc/intrin.h?r…
==============================================================================
--- trunk/reactos/include/crt/msc/intrin.h [iso-8859-1] (original)
+++ trunk/reactos/include/crt/msc/intrin.h [iso-8859-1] Wed Aug 24 22:02:41 2011
@@ -216,7 +216,7 @@
 unsigned __int64 _byteswap_uint64(unsigned __int64 value);
 #pragma intrinsic(_byteswap_uint64)
 #ifdef _M_AMD64
-unsigned char _bittest64(__int64 *a, __int64 b);
+unsigned char _bittest64(__int64 const *a, __int64 b);
 #pragma intrinsic(_bittest64)
 #endif
 

Modified: trunk/reactos/lib/3rdparty/stlport/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/stlport/CMake…
==============================================================================
--- trunk/reactos/lib/3rdparty/stlport/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/stlport/CMakeLists.txt [iso-8859-1] Wed Aug 24 22:02:41
2011
@@ -4,7 +4,8 @@
 
 add_definitions(
     -D_STLP_USE_EXCEPTIONS
-    -D_DLL -D__USE_CRTIMP)
+    -D_DLL -D__USE_CRTIMP
+    -D_BUILD_STLPORT)
 
 set_cpp()