Author: tkreuzer Date: Wed Dec 29 13:35:40 2010 New Revision: 50213
URL: http://svn.reactos.org/svn/reactos?rev=50213&view=rev Log: [STLPORT] - Only use #pragma intrinsics on MSVC - Don't add function prototypes for _InterlockedXxx
Modified: branches/cmake-bringup/include/c++/stlport/stl/config/_windows.h
Modified: branches/cmake-bringup/include/c++/stlport/stl/config/_windows.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/c%2B%2B/st... ============================================================================== --- branches/cmake-bringup/include/c++/stlport/stl/config/_windows.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/c++/stlport/stl/config/_windows.h [iso-8859-1] Wed Dec 29 13:35:40 2010 @@ -96,10 +96,12 @@
# if defined (_STLP_NEW_PLATFORM_SDK) && !defined(_WDMDDK_) # include <windef.h> +#ifndef InterlockedIncrement _STLP_IMPORT_DECLSPEC LONG _STLP_STDCALL InterlockedIncrement(IN OUT LONG volatile *); _STLP_IMPORT_DECLSPEC LONG _STLP_STDCALL InterlockedDecrement(IN OUT LONG volatile *); _STLP_IMPORT_DECLSPEC LONG _STLP_STDCALL InterlockedExchange(IN OUT LONG volatile *, LONG); _STLP_IMPORT_DECLSPEC void _STLP_STDCALL Sleep(DWORD); +#endif # if defined (_WIN64) _STLP_IMPORT_DECLSPEC void* _STLP_STDCALL _InterlockedExchangePointer(void* volatile *, void*); # endif @@ -180,7 +182,7 @@ _STLP_IMPORT_DECLSPEC void _STLP_STDCALL OutputDebugStringA(const char* lpOutputString); # endif
-# if defined (InterlockedIncrement) +# if defined (InterlockedIncrement) && defined(_MSC_VER) # pragma intrinsic(_InterlockedIncrement) # pragma intrinsic(_InterlockedDecrement) # pragma intrinsic(_InterlockedExchange)