2
0
mirror of https://github.com/boostorg/thread.git synced 2026-02-13 12:52:11 +00:00

Merged changes over from trunk

[SVN r47700]
This commit is contained in:
Anthony Williams
2008-07-23 09:35:40 +00:00
parent f03a9bfcf3
commit a264766584
5 changed files with 273 additions and 90 deletions

View File

@@ -18,7 +18,7 @@
#elif defined(__APPLE__) || defined(__FreeBSD__)
#include <sys/types.h>
#include <sys/sysctl.h>
#elif defined(__sun) || defined(__CYGWIN__)
#elif defined BOOST_HAS_UNISTD_H
#include <unistd.h>
#endif
@@ -394,7 +394,7 @@ namespace boost
int count;
size_t size=sizeof(count);
return sysctlbyname("hw.ncpu",&count,&size,NULL,0)?0:count;
#elif defined(__sun) || defined(__CYGWIN__)
#elif defined(BOOST_HAS_UNISTD_H) && defined(_SC_NPROCESSORS_ONLN)
int const count=sysconf(_SC_NPROCESSORS_ONLN);
return (count>0)?count:0;
#else