icc build fix
This was SVN commit r7204.
This commit is contained in:
parent
f7e16d9f3e
commit
7738eecbb0
@ -106,7 +106,7 @@ extern wchar_t* wcsdup(const wchar_t* str);
|
|||||||
|
|
||||||
|
|
||||||
// rint*, fminf, fpclassify (too few/diverse to make separate HAVE_ for each)
|
// rint*, fminf, fpclassify (too few/diverse to make separate HAVE_ for each)
|
||||||
#if HAVE_C99 || GCC_VERSION
|
#if HAVE_C99 || ICC_VERSION || GCC_VERSION
|
||||||
# define HAVE_C99_MATH 1
|
# define HAVE_C99_MATH 1
|
||||||
#else
|
#else
|
||||||
# define HAVE_C99_MATH 0
|
# define HAVE_C99_MATH 0
|
||||||
|
@ -61,6 +61,11 @@
|
|||||||
// (must come before any system headers because it fixes off_t)
|
// (must come before any system headers because it fixes off_t)
|
||||||
#include "lib/posix/posix_types.h"
|
#include "lib/posix/posix_types.h"
|
||||||
|
|
||||||
|
// (must come before any use of <math.h> due to incompatibility with ICC's mathimf.h)
|
||||||
|
#if ICC_VERSION
|
||||||
|
#include <mathimf.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "lib/sysdep/arch.h"
|
#include "lib/sysdep/arch.h"
|
||||||
#include "lib/sysdep/stl.h"
|
#include "lib/sysdep/stl.h"
|
||||||
|
|
||||||
|
@ -54,7 +54,9 @@ LIB_API const char* cpu_IdentifierString();
|
|||||||
**/
|
**/
|
||||||
#if MSC_VERSION
|
#if MSC_VERSION
|
||||||
# include <intrin.h>
|
# include <intrin.h>
|
||||||
# pragma intrinsic(_ReadWriteBarrier)
|
# if !ICC_VERSION
|
||||||
|
# pragma intrinsic(_ReadWriteBarrier)
|
||||||
|
# endif
|
||||||
# define cpu_MemoryBarrier() _ReadWriteBarrier()
|
# define cpu_MemoryBarrier() _ReadWriteBarrier()
|
||||||
#elif GCC_VERSION
|
#elif GCC_VERSION
|
||||||
# define cpu_MemoryBarrier() asm volatile("" : : : "memory")
|
# define cpu_MemoryBarrier() asm volatile("" : : : "memory")
|
||||||
|
Loading…
Reference in New Issue
Block a user