RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: [email protected] Module: rpm Date: 21-Feb-2009 10:07:49 Branch: HEAD Handle: 2009022109074900 Modified files: rpm/rpmio rpmz.c Log: hardcode darwin config too, should move to configure and lc_physmem.m4/lc_cpucores.m4 Summary: Revision Changes Path 1.26 +18 -0 rpm/rpmio/rpmz.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/rpmio/rpmz.c ============================================================================ $ cvs diff -u -r1.25 -r1.26 rpmz.c --- rpm/rpmio/rpmz.c 21 Feb 2009 09:04:48 -0000 1.25 +++ rpm/rpmio/rpmz.c 21 Feb 2009 09:07:49 -0000 1.26 @@ -262,7 +262,16 @@ } /*==============================================================*/ +#if linux #define HAVE_PHYSMEM_SYSCONF 1 /* XXX hotwired for linux */ +#endif +#if defined(__APPLE__) && defined(__MACH__) +#define HAVE_PHYSMEM_SYSCTL 1 /* XXX hotwired for darwin */ +#endif + +#if defined(HAVE_PHYSMEM_SYSCTL) /* HAVE_SYS_SYSCTL_H */ +#include <sys/sysctl.h> +#endif static rpmuint64_t physmem(void) /*...@*/ @@ -292,7 +301,16 @@ return ret; } +#if linux #define HAVE_NCPU_SYSCONF 1 /* XXX hotwired for linux */ +#endif +#if defined(__APPLE__) && defined(__MACH__) +#define HAVE_NCPU_SYSCTL 1 /* XXX hotwired for darwin */ +#endif + +#if defined(HAVE_NCPU_SYSCTL) /* HAVE_SYS_SYSCTL_H */ +#include <sys/sysctl.h> +#endif static void hw_cores(rpmz z) @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
