| 123456789101112131415161718192021222324252627282930313233343536373839 |
- --- squashfs4.2.orig/squashfs-tools/unsquashfs.c 2011-02-28 23:27:06.000000000 +0100
- +++ squashfs4.2/squashfs-tools/unsquashfs.c 2014-03-29 15:02:16.000000000 +0100
- @@ -29,7 +29,13 @@
- #include "compressor.h"
- #include "xattr.h"
-
- +#ifndef FNM_EXTMATCH
- +#define FNM_EXTMATCH 0
- +#endif
- +
- +#ifdef __linux__
- #include <sys/sysinfo.h>
- +#endif
- #include <sys/types.h>
-
- struct cache *fragment_cache, *data_cache;
- @@ -1810,7 +1816,7 @@ void initialise_threads(int fragment_buf
- "\n");
-
- if(processors == -1) {
- -#ifndef linux
- +#if 0
- int mib[2];
- size_t len = sizeof(processors);
-
- @@ -1821,11 +1827,13 @@ void initialise_threads(int fragment_buf
- mib[1] = HW_NCPU;
- #endif
-
- +#ifdef __linux__
- if(sysctl(mib, 2, &processors, &len, NULL, 0) == -1) {
- ERROR("Failed to get number of available processors. "
- "Defaulting to 1\n");
- processors = 1;
- }
- +#endif
- #else
- processors = sysconf(_SC_NPROCESSORS_ONLN);
- #endif
|
