diff --git a/source/lib/sysdep/ia32.cpp b/source/lib/sysdep/ia32.cpp index 01b95147b3..99df12e4ce 100755 --- a/source/lib/sysdep/ia32.cpp +++ b/source/lib/sysdep/ia32.cpp @@ -76,7 +76,7 @@ __asm // change FPU control word (used to set precision) -uint _control87(uint new_cw, uint mask) +uint ia32_control87(uint new_cw, uint mask) { __asm { diff --git a/source/lib/sysdep/ia32.h b/source/lib/sysdep/ia32.h index eb46bc5335..509dd11767 100755 --- a/source/lib/sysdep/ia32.h +++ b/source/lib/sysdep/ia32.h @@ -15,14 +15,14 @@ // Jan.Wassenberg@stud.uni-karlsruhe.de // http://www.stud.uni-karlsruhe.de/~urkt/ +#ifndef IA32_H +#define IA32_H + #ifndef _M_IX86 #error "including ia32.h without _M_IX86 defined" #endif -#ifndef IA32_H -#define IA32_H - -#include "lib.h" +#include "lib/types.h" extern double _ceil(double); @@ -37,7 +37,8 @@ extern u64 rdtsc(void); #define _PC_24 0x0000 // 24 bits #endif -extern uint _control87(uint new_cw, uint mask); +#define _control87 ia32_control87 +extern uint ia32_control87(uint new_cw, uint mask); extern void ia32_debug_break(void);