diff options
| author | Dave Watson <davejwatson@fb.com> | 2016-11-02 18:22:32 -0700 |
|---|---|---|
| committer | Jason Evans <jasone@canonware.com> | 2016-11-02 19:54:19 -0700 |
| commit | 6c56e194b02ec3888ed35c111d01ef2e62c6c808 (patch) | |
| tree | 972288c41fe5beec3d85fc5ab1541a41d36e7b89 | |
| parent | eca3bc01316bbd06ebc5e42f3fe9146ef9552754 (diff) | |
| download | jemalloc-6c56e194b02ec3888ed35c111d01ef2e62c6c808.tar.gz | |
Check for existance of CPU_COUNT macro before using it.
This resolves #485.
| -rw-r--r-- | src/jemalloc.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/jemalloc.c b/src/jemalloc.c index 8210086d..38650ff0 100644 --- a/src/jemalloc.c +++ b/src/jemalloc.c @@ -812,8 +812,10 @@ malloc_ncpus(void) SYSTEM_INFO si; GetSystemInfo(&si); result = si.dwNumberOfProcessors; -#elif defined(JEMALLOC_GLIBC_MALLOC_HOOK) +#elif defined(JEMALLOC_GLIBC_MALLOC_HOOK) && defined(CPU_COUNT) /* + * glibc >= 2.6 has the CPU_COUNT macro. + * * glibc's sysconf() uses isspace(). glibc allocates for the first time * *before* setting up the isspace tables. Therefore we need a * different method to get the number of CPUs. @@ -2053,6 +2055,7 @@ JEMALLOC_EXPORT void *(*__memalign_hook)(size_t alignment, size_t size) = je_memalign; # endif +#ifdef CPU_COUNT /* * To enable static linking with glibc, the libc specific malloc interface must * be implemented also, so none of glibc's malloc.o functions are added to the @@ -2071,6 +2074,9 @@ int __posix_memalign(void** r, size_t a, size_t s) PREALIAS(je_posix_memalign); #undef PREALIAS #undef ALIAS + +#endif + #endif /* |