[ros-diffs] [tkreuzer] 53369: [STLPORT] - Fix Interlocked* declarations - Fix amd64 build

Author: tkreuzer
Date: Mon Aug 22 13:14:46 2011
New Revision: 53369

URL: http://svn.reactos.org/svn/reactos?rev=53369&view=rev
Log:
[STLPORT]
- Fix Interlocked* declarations
- Fix amd64 build

Modified:
    trunk/reactos/include/c++/stlport/stl/config/_reactos.h
    trunk/reactos/include/c++/stlport/stl/config/_windows.h

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] Mon Aug 22
13:14:46 2011
@@ -302,13 +302,11 @@
 // Calling convention
 #define _STLP_CALL __cdecl
 
-// Include stlport windows specifics
-#include "_windows.h"
-
 #ifdef _M_AMD64
 #ifdef __cplusplus
 extern "C" {
 #endif
+    void * _InterlockedExchangePointer(void * volatile * Target, void * Value);
     _STLP_IMPORT_DECLSPEC void* InterlockedFlushSList(void*);
     _STLP_IMPORT_DECLSPEC void* InterlockedPopEntrySList(void*);
     _STLP_IMPORT_DECLSPEC void* InterlockedPushEntrySList(void*, void*);
@@ -320,6 +318,9 @@
 
 #undef __cdecl__
 #define __cdecl__
+#endif /* _M_AMD64 */
+
+// Include stlport windows specifics
+#include "_windows.h"
+
 #endif
-
-#endif

Modified: trunk/reactos/include/c++/stlport/stl/config/_windows.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/c%2B%2B/stlport/st…
==============================================================================
--- trunk/reactos/include/c++/stlport/stl/config/_windows.h [iso-8859-1] (original)
+++ trunk/reactos/include/c++/stlport/stl/config/_windows.h [iso-8859-1] Mon Aug 22
13:14:46 2011
@@ -114,9 +114,9 @@
 /* boris : for the latest SDK, you may actually need the other version of the declaration
(above)
  * even for earlier VC++ versions. There is no way to tell SDK versions apart, sorry ...
  */
-_STLP_IMPORT_DECLSPEC long _STLP_STDCALL InterlockedIncrement(long*);
-_STLP_IMPORT_DECLSPEC long _STLP_STDCALL InterlockedDecrement(long*);
-_STLP_IMPORT_DECLSPEC long _STLP_STDCALL InterlockedExchange(long*, long);
+_STLP_IMPORT_DECLSPEC long _STLP_STDCALL InterlockedIncrement(long volatile *);
+_STLP_IMPORT_DECLSPEC long _STLP_STDCALL InterlockedDecrement(long volatile *);
+_STLP_IMPORT_DECLSPEC long _STLP_STDCALL InterlockedExchange(long volatile *, long);
 #    else
 /* start of eMbedded Visual C++ specific section */
 #      include <stl/config/_native_headers.h>