2009-09-08 Ozkan Sezer <sezeroz@gmail.com>
* intrincs/*.c: Update all declarations to match intrin.h. Include
only intrin.h, not windows.h. Removed aliases for non-underscored
InterlockedAdd, InterlockedAdd64 and InterlockedBitTestAndComplement.
Added non-underscored aliases for InterlockedAdd, InterlockedAdd64
and InterlockedBitTestAndComplement, which aren't actually prototyped
in intrin.h but are wrappers around other intrinsics. currentfiber.c,
currentteb.c, fiberdata.c, membarrier.c, mul128ex.c and umul128ex.c
remain untouched.
* Makefile.am (membarrier.c): Moved under src_libmingwex32 (x86-only)
* Makefile.in: Regenerated.
git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@1332 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-crt/intrincs/readcr0.c b/mingw-w64-crt/intrincs/readcr0.c
index 7665a9d..6c635e3 100644
--- a/mingw-w64-crt/intrincs/readcr0.c
+++ b/mingw-w64-crt/intrincs/readcr0.c
@@ -4,16 +4,13 @@
* No warranty is given; refer to the file DISCLAIMER within this package.
*/
-#define __CRT__NO_INLINE
-#include <_mingw.h>
+#include <intrin.h>
/* Register sizes are different between 32/64 bit mode.
* So we have to do this for _WIN64 and _WIN32 seperatly.
*/
#ifdef _WIN64
- unsigned __int64 __readcr0(void);
-
unsigned __int64 __readcr0(void)
{
unsigned __int64 value;
@@ -23,8 +20,6 @@
return value;
}
#else
- unsigned long __readcr0(void);
-
unsigned long __readcr0(void)
{
unsigned long value;