diff options
| author | Henrik Nord <[email protected]> | 2011-09-08 16:36:26 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2011-09-08 16:36:26 +0200 |
| commit | f602ae4f0c727c1ff37e69887ba33f46b24c54e1 (patch) | |
| tree | 340525e4b69e6971854de896b4f64d70b2224b0a /erts/lib_src | |
| parent | 6fae573fc291f4a77282b918cae346064bece80e (diff) | |
| parent | 262a9af33d3ceb4cb032c434b100cea7d4b0d60e (diff) | |
| download | otp-f602ae4f0c727c1ff37e69887ba33f46b24c54e1.tar.gz otp-f602ae4f0c727c1ff37e69887ba33f46b24c54e1.tar.bz2 otp-f602ae4f0c727c1ff37e69887ba33f46b24c54e1.zip | |
Merge branch 'dev' into major
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> |