diff options
| author | Henrik Nord <[email protected]> | 2011-09-08 16:32:26 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2011-09-08 16:32:30 +0200 |
| commit | d3d5a066f06509fa7546443bf841d07167c5fb60 (patch) | |
| tree | 226e741f650f48692eeb6d41e649516b77b8b2aa /erts/lib_src | |
| parent | b65eb33effd41e3421acdc46bb5b6495c814d2b7 (diff) | |
| parent | e68fde947e540c38366d6888dfd6945efb49a880 (diff) | |
| download | otp-d3d5a066f06509fa7546443bf841d07167c5fb60.tar.gz otp-d3d5a066f06509fa7546443bf841d07167c5fb60.tar.bz2 otp-d3d5a066f06509fa7546443bf841d07167c5fb60.zip | |
Merge branch 'hw/detect-cpus-on-irix' into dev
* hw/detect-cpus-on-irix:
Detect the available CPUs on IRIX
OTP-9531
Diffstat (limited to 'erts/lib_src')
| -rw-r--r-- | erts/lib_src/common/erl_misc_utils.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/erts/lib_src/common/erl_misc_utils.c b/erts/lib_src/common/erl_misc_utils.c index 35b148990a..5e94ff19db 100644 --- a/erts/lib_src/common/erl_misc_utils.c +++ b/erts/lib_src/common/erl_misc_utils.c @@ -55,6 +55,12 @@ # ifdef HAVE_UNISTD_H # include <unistd.h> # endif +# if defined(_SC_NPROC_CONF) && !defined(_SC_NPROCESSORS_CONF) +# define _SC_NPROCESSORS_CONF _SC_NPROC_CONF +# endif +# if defined(_SC_NPROC_ONLN) && !defined(_SC_NPROCESSORS_ONLN) +# define _SC_NPROCESSORS_ONLN _SC_NPROC_ONLN +# endif # if (defined(NO_SYSCONF) || !defined(_SC_NPROCESSORS_CONF)) # ifdef HAVE_SYS_SYSCTL_H # include <sys/sysctl.h> |