mirror of
https://github.com/git/git.git
synced 2024-11-01 14:57:52 +01:00
435bdf8c7f
Centralize the include of windows.h in git-compat-util.h, turn on WIN32_LEAN_AND_MEAN to avoid including plenty of other header files which is not needed in Git. Also ensure we load winsock2.h first, so we don't load the older winsock definitions at a later stage, since they contain duplicate definitions. When moving windows.h into git-compat-util.h, we need to protect the definition of struct pollfd in mingw.h, since this file is used by both MinGW and MSVC, and the latter defines this struct in winsock2.h. We need to keep the windows.h include in compat/win32.h, since its shared by both MinGW and Cygwin, and we're not touching Cygwin in this commit. The include in git-compat-util.h is protected with an ifdef WIN32, which is not the case when compiling for Cygwin. Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
45 lines
965 B
C
45 lines
965 B
C
#include "cache.h"
|
|
|
|
#if defined(hpux) || defined(__hpux) || defined(_hpux)
|
|
# include <sys/pstat.h>
|
|
#endif
|
|
|
|
/*
|
|
* By doing this in two steps we can at least get
|
|
* the function to be somewhat coherent, even
|
|
* with this disgusting nest of #ifdefs.
|
|
*/
|
|
#ifndef _SC_NPROCESSORS_ONLN
|
|
# ifdef _SC_NPROC_ONLN
|
|
# define _SC_NPROCESSORS_ONLN _SC_NPROC_ONLN
|
|
# elif defined _SC_CRAY_NCPU
|
|
# define _SC_NPROCESSORS_ONLN _SC_CRAY_NCPU
|
|
# endif
|
|
#endif
|
|
|
|
int online_cpus(void)
|
|
{
|
|
#ifdef _SC_NPROCESSORS_ONLN
|
|
long ncpus;
|
|
#endif
|
|
|
|
#ifdef _WIN32
|
|
SYSTEM_INFO info;
|
|
GetSystemInfo(&info);
|
|
|
|
if ((int)info.dwNumberOfProcessors > 0)
|
|
return (int)info.dwNumberOfProcessors;
|
|
#elif defined(hpux) || defined(__hpux) || defined(_hpux)
|
|
struct pst_dynamic psd;
|
|
|
|
if (!pstat_getdynamic(&psd, sizeof(psd), (size_t)1, 0))
|
|
return (int)psd.psd_proc_cnt;
|
|
#endif
|
|
|
|
#ifdef _SC_NPROCESSORS_ONLN
|
|
if ((ncpus = (long)sysconf(_SC_NPROCESSORS_ONLN)) > 0)
|
|
return (int)ncpus;
|
|
#endif
|
|
|
|
return 1;
|
|
}
|