aboutsummaryrefslogtreecommitdiffstats
path: root/erts/lib_src/common/erl_misc_utils.c
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2014-06-06 01:57:57 +0200
committerRickard Green <[email protected]>2014-06-06 01:57:57 +0200
commitdd06ee01e06300725f46c85df18faace2d01d9d6 (patch)
tree8cdc08ff7c6730971e32e9bde2c49d784755228e /erts/lib_src/common/erl_misc_utils.c
parent8b4659d5246166cef9b8e9aa91c644e3b3ec66d5 (diff)
parent4eabd78146594a9cd75eb9dc62ba449f7b6b8eb5 (diff)
downloadotp-dd06ee01e06300725f46c85df18faace2d01d9d6.tar.gz
otp-dd06ee01e06300725f46c85df18faace2d01d9d6.tar.bz2
otp-dd06ee01e06300725f46c85df18faace2d01d9d6.zip
Merge branch 'jjhoo/mingw_compile_fix_forceinline/OTP-11945' into maint
* jjhoo/mingw_compile_fix_forceinline/OTP-11945: Do not use __always_inline__ attribute unless gcc vsn >= 3.1.1 Add ETHR_FORCE_INLINE define to hide compiler specific directives
Diffstat (limited to 'erts/lib_src/common/erl_misc_utils.c')
-rw-r--r--erts/lib_src/common/erl_misc_utils.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/erts/lib_src/common/erl_misc_utils.c b/erts/lib_src/common/erl_misc_utils.c
index 5a271c5268..8bf7656bb0 100644
--- a/erts/lib_src/common/erl_misc_utils.c
+++ b/erts/lib_src/common/erl_misc_utils.c
@@ -25,6 +25,7 @@
# include <windows.h>
#endif
+#include "ethread.h"
#include "erl_misc_utils.h"
#if defined(__WIN32__)
@@ -191,7 +192,7 @@ struct erts_cpu_info_t_ {
#if defined(__WIN32__)
-static __forceinline int
+static ETHR_FORCE_INLINE int
get_proc_affinity(erts_cpu_info_t *cpuinfo, cpu_set_t *cpuset)
{
DWORD_PTR pamask;
@@ -206,7 +207,7 @@ get_proc_affinity(erts_cpu_info_t *cpuinfo, cpu_set_t *cpuset)
}
}
-static __forceinline int
+static ETHR_FORCE_INLINE int
set_thr_affinity(cpu_set_t *set)
{
if (*set == (cpu_set_t) 0)
@@ -1157,7 +1158,7 @@ read_topology(erts_cpu_info_t *cpuinfo)
#define ERTS_MU_RELATION_CACHE 2 /* RelationCache */
#define ERTS_MU_RELATION_PROCESSOR_PACKAGE 3 /* RelationProcessorPackage */
-static __forceinline int
+static ETHR_FORCE_INLINE int
rel_cmp_val(int r)
{
switch (r) {