* _mingw.h (__debugbreak): Add prototype before the inline as it appears in intrin.h. * winnt.h: Move the intrin.h include before the __faststorefence inline. Remove the redundant prototype for _m_prefetchw() which is already in intrin.h. git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/branches/releases/v1.0@4290 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-crt/ChangeLog b/mingw-w64-crt/ChangeLog index 727b86a..9d922e8 100644 --- a/mingw-w64-crt/ChangeLog +++ b/mingw-w64-crt/ChangeLog
@@ -1,4 +1,4 @@ -2011-05-23 Ozkan Sezer <sezeroz@gmail.com> +2011-07-23 Ozkan Sezer <sezeroz@gmail.com> * lib32/vfw32.mri: Adjust for lib32 subdirectory. * lib32/vfw64.mri: New.
diff --git a/mingw-w64-headers/include/ChangeLog b/mingw-w64-headers/include/ChangeLog index 85dd3a8..84ded3b 100644 --- a/mingw-w64-headers/include/ChangeLog +++ b/mingw-w64-headers/include/ChangeLog
@@ -1,3 +1,11 @@ +2011-07-23 Ozkan Sezer <sezeroz@gmail.com> + + * _mingw.h (__debugbreak): Add prototype before the inline as it + appears in intrin.h. + * winnt.h: Move the intrin.h include before the __faststorefence + inline. Remove the redundant prototype for _m_prefetchw() which + is already in intrin.h. + 2011-07-21 Ozkan Sezer <sezeroz@gmail.com> * winnt.h (C_ASSERT): Define using EXTERN_C instead of extern.
diff --git a/mingw-w64-headers/include/_mingw.h b/mingw-w64-headers/include/_mingw.h index 5991c60..b3261d5 100644 --- a/mingw-w64-headers/include/_mingw.h +++ b/mingw-w64-headers/include/_mingw.h
@@ -612,6 +612,7 @@ #endif #ifdef __MINGW_INTRIN_INLINE +void __cdecl __debugbreak(void); __MINGW_INTRIN_INLINE void __cdecl __debugbreak(void) { __asm__ __volatile__("int $3");
diff --git a/mingw-w64-headers/include/winnt.h b/mingw-w64-headers/include/winnt.h index 6246d9a..666408d 100644 --- a/mingw-w64-headers/include/winnt.h +++ b/mingw-w64-headers/include/winnt.h
@@ -1421,6 +1421,8 @@ VOID _ReadWriteBarrier(VOID); +#include <intrin.h> + #define FastFence __faststorefence /* FIXME: implement proprely */ #define LoadFence _mm_lfence #define MemoryFence _mm_mfence @@ -1432,10 +1434,6 @@ } #endif - void _m_prefetchw(void *Source); - -#include <intrin.h> - #define YieldProcessor _mm_pause #define MemoryBarrier __faststorefence /* FIXME: implement proprely */ #define PreFetchCacheLine(l,a) _mm_prefetch((CHAR CONST *) a,l)