From ecde07a4c7b3a18912b1af0db429e3e6733719eb Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Mon, 22 Aug 2011 13:14:46 +0000
Subject: [PATCH] [STLPORT] - Fix Interlocked* declarations - Fix amd64 build

svn path=/trunk/; revision=53369
---
 reactos/include/c++/stlport/stl/config/_reactos.h | 9 +++++----
 reactos/include/c++/stlport/stl/config/_windows.h | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/reactos/include/c++/stlport/stl/config/_reactos.h b/reactos/include/c++/stlport/stl/config/_reactos.h
index bcebf7d1431..6a5d8a72577 100644
--- a/reactos/include/c++/stlport/stl/config/_reactos.h
+++ b/reactos/include/c++/stlport/stl/config/_reactos.h
@@ -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 @@ extern "C" {
 
 #undef __cdecl__
 #define __cdecl__
-#endif
+#endif /* _M_AMD64 */
+
+// Include stlport windows specifics
+#include "_windows.h"
 
 #endif
diff --git a/reactos/include/c++/stlport/stl/config/_windows.h b/reactos/include/c++/stlport/stl/config/_windows.h
index 216551b8b70..ac9856eb31d 100644
--- a/reactos/include/c++/stlport/stl/config/_windows.h
+++ b/reactos/include/c++/stlport/stl/config/_windows.h
@@ -114,9 +114,9 @@ _STLP_IMPORT_DECLSPEC void* _STLP_STDCALL _InterlockedExchangePointer(void* vola
 /* 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>