summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnthony Baxter <anthonybaxter@gmail.com>2004-10-13 15:30:56 (GMT)
committerAnthony Baxter <anthonybaxter@gmail.com>2004-10-13 15:30:56 (GMT)
commit8a560dee7291f75968eea773c1258f2c25b5a81f (patch)
treeec6cee1dfa018242cada55cb5c5b1849a437d721
parente4f8a48b8fa0a0ec19d4c35bf213d0022e3f398d (diff)
downloadcpython-8a560dee7291f75968eea773c1258f2c25b5a81f.zip
cpython-8a560dee7291f75968eea773c1258f2c25b5a81f.tar.gz
cpython-8a560dee7291f75968eea773c1258f2c25b5a81f.tar.bz2
Patch 977343, Solaris likes sys/loadavg.h. Added support for sys/loadavg.h
detection to configure &c.
-rw-r--r--Modules/posixmodule.c4
-rwxr-xr-xconfigure6
-rw-r--r--configure.in3
-rw-r--r--pyconfig.h.in3
4 files changed, 13 insertions, 3 deletions
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index e71467b..31d7c61 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -67,6 +67,10 @@ corresponding Unix manual entries for more information on calls.");
#include <sysexits.h>
#endif /* HAVE_SYSEXITS_H */
+#ifdef HAVE_SYS_LOADAVG_H
+#include <sys/loadavg.h>
+#endif
+
/* Various compilers have only certain posix functions */
/* XXX Gosh I wish these were all moved into pyconfig.h */
#if defined(PYCC_VACPP) && defined(PYOS_OS2)
diff --git a/configure b/configure
index 5605a8c..7b69003 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 1.470 .
+# From configure.in Revision: 1.471 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for python 2.4.
#
@@ -4532,11 +4532,13 @@ done
+
for ac_header in curses.h dlfcn.h fcntl.h grp.h langinfo.h \
libintl.h ncurses.h poll.h pthread.h \
stropts.h termios.h thread.h \
unistd.h utime.h \
-sys/audioio.h sys/bsdtty.h sys/file.h sys/lock.h sys/mkdev.h sys/modem.h \
+sys/audioio.h sys/bsdtty.h sys/file.h sys/loadavg.h sys/lock.h sys/mkdev.h \
+sys/modem.h \
sys/param.h sys/poll.h sys/select.h sys/socket.h sys/time.h sys/times.h \
sys/un.h sys/utsname.h sys/wait.h pty.h libutil.h \
sys/resource.h netpacket/packet.h sysexits.h bluetooth.h \
diff --git a/configure.in b/configure.in
index f5f4ffc..981d2ba 100644
--- a/configure.in
+++ b/configure.in
@@ -959,7 +959,8 @@ AC_CHECK_HEADERS(curses.h dlfcn.h fcntl.h grp.h langinfo.h \
libintl.h ncurses.h poll.h pthread.h \
stropts.h termios.h thread.h \
unistd.h utime.h \
-sys/audioio.h sys/bsdtty.h sys/file.h sys/lock.h sys/mkdev.h sys/modem.h \
+sys/audioio.h sys/bsdtty.h sys/file.h sys/loadavg.h sys/lock.h sys/mkdev.h \
+sys/modem.h \
sys/param.h sys/poll.h sys/select.h sys/socket.h sys/time.h sys/times.h \
sys/un.h sys/utsname.h sys/wait.h pty.h libutil.h \
sys/resource.h netpacket/packet.h sysexits.h bluetooth.h \
diff --git a/pyconfig.h.in b/pyconfig.h.in
index a9f3d20..34501f4 100644
--- a/pyconfig.h.in
+++ b/pyconfig.h.in
@@ -512,6 +512,9 @@
/* Define to 1 if you have the <sys/file.h> header file. */
#undef HAVE_SYS_FILE_H
+/* Define to 1 if you have the <sys/loadavg.h> header file. */
+#undef HAVE_SYS_LOADAVG_H
+
/* Define to 1 if you have the <sys/lock.h> header file. */
#undef HAVE_SYS_LOCK_H