diff options
| author | Rickard Green <[email protected]> | 2014-06-06 01:58:19 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-06-06 01:58:19 +0200 |
| commit | 7372e3e8adc6cc9f0b59a4bc47ea0a1af3e5fd1f (patch) | |
| tree | 35325810d31ee92c4049326e2f6286609354cbf7 /erts/lib_src/common/erl_misc_utils.c | |
| parent | c54a0025e6a4d152ba73e92a2007052ebde391bf (diff) | |
| parent | dd06ee01e06300725f46c85df18faace2d01d9d6 (diff) | |
| download | otp-7372e3e8adc6cc9f0b59a4bc47ea0a1af3e5fd1f.tar.gz otp-7372e3e8adc6cc9f0b59a4bc47ea0a1af3e5fd1f.tar.bz2 otp-7372e3e8adc6cc9f0b59a4bc47ea0a1af3e5fd1f.zip | |
Merge branch 'maint'
* maint:
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.c | 7 |
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) { |