diff options
author | Björn-Egil Dahlberg <egil@erlang.org> | 2013-03-04 15:00:12 +0100 |
---|---|---|
committer | Björn-Egil Dahlberg <egil@erlang.org> | 2013-03-04 16:56:08 +0100 |
commit | 41e849eecd06ebb1472ddfb369243f0b337e0bd7 (patch) | |
tree | daa63cc92cdc46acf98377701a43b6dba0b28dc7 /erts/emulator/sys/unix | |
parent | 209f6091c24c63651132dae4cbcf1eab9ea8913c (diff) | |
download | otp-41e849eecd06ebb1472ddfb369243f0b337e0bd7.tar.gz otp-41e849eecd06ebb1472ddfb369243f0b337e0bd7.tar.bz2 otp-41e849eecd06ebb1472ddfb369243f0b337e0bd7.zip |
erts: gcc ansi does not allow 'inline'
Diffstat (limited to 'erts/emulator/sys/unix')
-rw-r--r-- | erts/emulator/sys/unix/sys_float.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/erts/emulator/sys/unix/sys_float.c b/erts/emulator/sys/unix/sys_float.c index f2f4de869d..787f8d6728 100644 --- a/erts/emulator/sys/unix/sys_float.c +++ b/erts/emulator/sys/unix/sys_float.c @@ -152,7 +152,7 @@ static int mask_sse2(void) #if defined(__x86_64__) -static inline int cpu_has_sse2(void) { return 1; } +static ERTS_INLINE int cpu_has_sse2(void) { return 1; } #else /* !__x86_64__ */ @@ -179,7 +179,7 @@ static unsigned int xor_eflags(unsigned int mask) return eax; } -static __inline__ unsigned int cpuid_eax(unsigned int op) +static ERTS_INLINE unsigned int cpuid_eax(unsigned int op) { unsigned int eax, save_ebx; @@ -195,7 +195,7 @@ static __inline__ unsigned int cpuid_eax(unsigned int op) return eax; } -static __inline__ unsigned int cpuid_edx(unsigned int op) +static ERTS_INLINE unsigned int cpuid_edx(unsigned int op) { unsigned int eax, edx, save_ebx; @@ -215,7 +215,7 @@ static __inline__ unsigned int cpuid_edx(unsigned int op) * register on the Intel486 processor to generate alignment * faults. This bit cannot be set on the Intel386 processor. */ -static __inline__ int is_386(void) +static ERTS_INLINE int is_386(void) { return ((xor_eflags(1<<18) >> 18) & 1) == 0; } @@ -223,7 +223,7 @@ static __inline__ int is_386(void) /* Newer x86 processors have a CPUID instruction, as indicated by * the ID bit (#21) in EFLAGS being modifiable. */ -static __inline__ int has_CPUID(void) +static ERTS_INLINE int has_CPUID(void) { return (xor_eflags(1<<21) >> 21) & 1; } |