Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 15:33:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

[STLPORT]

Browse source 
- Fix Interlocked* declarations
- Fix amd64 build

svn path=/trunk/; revision=53369
This commit is contained in:
Timo Kreuzer 2011-08-22 13:14:46 +00:00
parent 8dd9c148b2
commit ecde07a4c7
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
reactos/include/c++/stlport/stl/config/_reactos.h
View file

@ -302,13 +302,11 @@
// Calling convention // Calling convention
#define _STLP_CALL __cdecl #define _STLP_CALL __cdecl
// Include stlport windows specifics
#include "_windows.h"
#ifdef _M_AMD64 #ifdef _M_AMD64
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
void * _InterlockedExchangePointer(void * volatile * Target, void * Value);
_STLP_IMPORT_DECLSPEC void* InterlockedFlushSList(void*); _STLP_IMPORT_DECLSPEC void* InterlockedFlushSList(void*);
_STLP_IMPORT_DECLSPEC void* InterlockedPopEntrySList(void*); _STLP_IMPORT_DECLSPEC void* InterlockedPopEntrySList(void*);
_STLP_IMPORT_DECLSPEC void* InterlockedPushEntrySList(void*, void*); _STLP_IMPORT_DECLSPEC void* InterlockedPushEntrySList(void*, void*);
@ -320,6 +318,9 @@ extern "C" {
#undef __cdecl__ #undef __cdecl__
#define __cdecl__ #define __cdecl__
#endif #endif /* _M_AMD64 */
// Include stlport windows specifics
#include "_windows.h"
#endif #endif

6
reactos/include/c++/stlport/stl/config/_windows.h
View file

@ -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) /* 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 ... * 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 InterlockedIncrement(long volatile *);
_STLP_IMPORT_DECLSPEC long _STLP_STDCALL InterlockedDecrement(long*); _STLP_IMPORT_DECLSPEC long _STLP_STDCALL InterlockedDecrement(long volatile *);
_STLP_IMPORT_DECLSPEC long _STLP_STDCALL InterlockedExchange(long*, long); _STLP_IMPORT_DECLSPEC long _STLP_STDCALL InterlockedExchange(long volatile *, long);
# else # else
/* start of eMbedded Visual C++ specific section */ /* start of eMbedded Visual C++ specific section */
# include <stl/config/_native_headers.h> # include <stl/config/_native_headers.h>