remove support for missing ANSI C header files (limits.h, stddef.h, etc).

diff --git a/Include/Python.h b/Include/Python.h
index bff2c57e067e53e586bf9d11d6e49f66c413783e..232cdbe360dfb89a5bbd0d47d0f10699dea3bc9b 100644 (file)
--- a/Include/Python.h
+++ b/Include/Python.h
@@ -15,11 +15,7 @@
 #define WITH_CYCLE_GC 1
 #endif
 
-#ifdef HAVE_LIMITS_H
 #include <limits.h>
-#else
-#error "limits.h is required by std C -- why isn't HAVE_LIMITS_H defined?"
-#endif
 
 #ifndef UCHAR_MAX
 #error "Something's broken.  UCHAR_MAX should be defined in limits.h."
@@ -40,9 +36,7 @@
 
 #include <string.h>
 #include <errno.h>
-#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

diff --git a/Include/pyport.h b/Include/pyport.h
index 5b0e590aee15071b0a9c7a890f9c3a24ea3a657d..79b92c3de177c678daa3e22adb691f8027186761 100644 (file)
--- a/Include/pyport.h
+++ b/Include/pyport.h
@@ -85,9 +85,7 @@ typedef PY_LONG_LONG          Py_intptr_t;
 #   error "Python needs a typedef for Py_uintptr_t in pyport.h."
 #endif /* HAVE_UINTPTR_T */
 
-#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
-#endif
 
 #include <math.h> /* Moved here from the math section, before extern "C" */
 

diff --git a/Include/structmember.h b/Include/structmember.h
index 3f4cfe0ffbf832fdc5e55e5a8c73d19e1d4c5802..015ca19c85cdefcb69967b1d45bff8232a783f7c 100644 (file)
--- a/Include/structmember.h
+++ b/Include/structmember.h
@@ -7,9 +7,7 @@ extern "C" {
 
 /* Interface to map C struct members to Python object attributes */
 
-#ifdef HAVE_STDDEF_H
 #include <stddef.h> /* For offsetof */
-#endif
 
 /* The offsetof() macro calculates the offset of a structure member
    in its structure.  Unfortunately this cannot be written down

diff --git a/Misc/NEWS b/Misc/NEWS
index 33ff1527ddb29df99d0d16f8443e3ad04948468b..45068ada6bd1035f3641e2bdcbae0761801bbc13 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -334,6 +334,9 @@ Tools/Demos
 Build
 -----
 
+- Support for missing ANSI C header files (limits.h, stddef.h, etc) was
+  removed.
+
 - Systems requiring the D4, D6 or D7 variants of pthreads are no longer
   supported (see PEP 11).
 

diff --git a/Modules/expat/macconfig.h b/Modules/expat/macconfig.h
index 3c5eb541a12eb4abfaa105bc44e3e5ba7080c5c9..0a7f39dd452e0c04fc2221586d1b3f63931ff1eb 100644 (file)
--- a/Modules/expat/macconfig.h
+++ b/Modules/expat/macconfig.h
@@ -42,15 +42,9 @@
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H
-
 /* Define to 1 if you have the <strings.h> header file. */
 #undef HAVE_STRINGS_H
 
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H
-
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 

diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 71a102c7c28a72e9601a9e54651d0f70144263be..e51310d64c163ae1b89d24504945b8927ae5ac37 100644 (file)
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -53,9 +53,7 @@ corresponding Unix manual entries for more information on calls.");
 #include <sys/wait.h>          /* For WNOHANG */
 #endif
 
-#ifdef HAVE_SIGNAL_H
 #include <signal.h>
-#endif
 
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>

diff --git a/Modules/readline.c b/Modules/readline.c
index 7535ecf5b976411ac844631a819513a7689b8f51..e1515371241af4d6c9b2656e283561568f27ec0c 100644 (file)
--- a/Modules/readline.c
+++ b/Modules/readline.c
@@ -12,7 +12,7 @@
 #include <signal.h>
 #include <errno.h>
 
-#if defined(HAVE_LOCALE_H) && defined(HAVE_SETLOCALE)
+#if defined(HAVE_SETLOCALE)
 /* GNU readline() mistakenly sets the LC_CTYPE locale.
  * This is evil.  Only the user or the app's main() should do this!
  * We must save and restore the locale around the rl_initialize() call.

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index c897f65052c021aabd1621682299978f3973649d..81a65f00854bfe83824ce911604851a293ec754d 100644 (file)
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -247,9 +247,7 @@ int h_errno; /* not used */
 
 #endif
 
-#ifdef HAVE_STDDEF_H
-# include <stddef.h>
-#endif
+#include <stddef.h>
 
 #ifndef offsetof
 # define offsetof(type, member)        ((size_t)(&((type *)0)->member))

diff --git a/PC/os2emx/pyconfig.h b/PC/os2emx/pyconfig.h
index a0817f8df7da0b15d7f8d2cdab1d442a0b2d92a6..afe79e48b7807e75f71e2a8649b42b584699d509 100644 (file)
--- a/PC/os2emx/pyconfig.h
+++ b/PC/os2emx/pyconfig.h
@@ -227,9 +227,6 @@ typedef long intptr_t;
 /* Define if you have the sigaction function. */
 #define HAVE_SIGACTION 1
 
-/* Define if you have the strdup function. */
-#define HAVE_STRDUP 1
-
 /* Define if you have the strerror function. */
 #define HAVE_STRERROR 1
 
@@ -263,27 +260,9 @@ typedef long intptr_t;
 /* Define if you have the <fcntl.h> header file. */
 #define HAVE_FCNTL_H 1
 
-/* Define if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
-/* Define if you have the <locale.h> header file. */
-#define HAVE_LOCALE_H 1
-
 /* Define if you have the <ncurses.h> header file. */
 #define HAVE_NCURSES_H 1
 
-/* Define if you have the <signal.h> header file. */
-#define HAVE_SIGNAL_H 1
-
-/* Define if you have the <stdarg.h> header file. */
-#define HAVE_STDARG_H 1
-
-/* Define if you have the <stddef.h> header file. */
-#define HAVE_STDDEF_H 1
-
-/* Define if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
 /* Define if you have the <sys/file.h> header file. */
 #define HAVE_SYS_FILE_H 1
 

diff --git a/PC/os2vacpp/pyconfig.h b/PC/os2vacpp/pyconfig.h
index d175f51f436279d7acf660b5bf1faff8668704d2..0051d92c0255acb844a108b6b8887ef9dfe3f97e 100644 (file)
--- a/PC/os2vacpp/pyconfig.h
+++ b/PC/os2vacpp/pyconfig.h
@@ -109,29 +109,22 @@ typedef int pid_t;
 /* #undef BAD_STATIC_FORWARD */ /* if compiler botches static fwd decls */
 
 #define STDC_HEADERS             1 /* VAC++ is an ANSI C Compiler           */
-#define HAVE_LIMITS_H            1 /* #include <limits.h>                   */
-#define HAVE_STDLIB_H            1 /* #include <stdlib.h>                   */
 #define HAVE_HYPOT               1 /* hypot()                               */
 #define HAVE_PUTENV              1 /* putenv()                              */
-#define HAVE_STDDEF_H            1 /* #include <stddef.h>                   */
 /* #define VA_LIST_IS_ARRAY   1 */ /* if va_list is an array of some kind   */
 
   /* Variable-Arguments/Prototypes */
 #define HAVE_PROTOTYPES          1 /* VAC++ supports C Function Prototypes  */
-#define HAVE_STDARG_H            1 /* #include <stdarg.h>                   */
 #define HAVE_STDARG_PROTOTYPES   1 /* Our <stdarg.h> has prototypes         */
 
   /* String/Memory/Locale Operations */
-#define HAVE_STRDUP              1 /* strdup()                              */
 #define HAVE_MEMMOVE             1 /* memmove()                             */
 #define HAVE_STRERROR            1 /* strerror()                            */
 #define HAVE_SETLOCALE           1 /* setlocale()                           */
-#define HAVE_LOCALE_H            1 /* #include <locale.h>                   */
 #define MALLOC_ZERO_RETURNS_NULL 1 /* Our malloc(0) returns a NULL ptr      */
 
   /* Signal Handling */
 #define RETSIGTYPE            void /* Return type of handlers (int or void) */
-#define HAVE_SIGNAL_H            1 /* #include <signal.h>                   */
 /* #undef WANT_SIGFPE_HANDLER   */ /* Handle SIGFPE (see Include/pyfpe.h)   */
 /* #define HAVE_ALARM         1 */ /* alarm()                               */
 /* #define HAVE_SIGINTERRUPT  1 */ /* siginterrupt()                        */

diff --git a/PC/pyconfig.h b/PC/pyconfig.h
index 54c98d18d082eaa3e15621d718c127198d573a1d..79f5ddd52f9c5b8f7978b7c5602504b7db86f638 100644 (file)
--- a/PC/pyconfig.h
+++ b/PC/pyconfig.h
@@ -28,7 +28,6 @@ MS_CORE_DLL.
 */
 
 #include <io.h>
-#define HAVE_LIMITS_H
 #define HAVE_SYS_UTIME_H
 #define HAVE_HYPOT
 #define HAVE_TEMPNAM
@@ -478,21 +477,9 @@ Py_NO_ENABLE_SHARED to find out.  Also support MS_NO_COREDLL for b/w compat */
 /* Define if you have the <fcntl.h> header file.  */
 #define HAVE_FCNTL_H 1
 
-/* Define if you have the <signal.h> header file.  */
-#define HAVE_SIGNAL_H 1
-
-/* Define if you have the <stdarg.h> header file.  */
-#define HAVE_STDARG_H 1
-
 /* Define if you have the <stdarg.h> prototypes.  */
 #define HAVE_STDARG_PROTOTYPES
 
-/* Define if you have the <stddef.h> header file.  */
-#define HAVE_STDDEF_H 1
-
-/* Define if you have the <stdlib.h> header file.  */
-#define HAVE_STDLIB_H 1
-
 /* Define if you have the <sys/audioio.h> header file.  */
 /* #undef HAVE_SYS_AUDIOIO_H */
 

diff --git a/Python/ceval.c b/Python/ceval.c
index f2d79e77dfb72aaf1cdfc67a5edd2a91b19e3bc5..cf5e9ece42a2a16b31539047d27a927e06cdbd9a 100644 (file)
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -806,17 +806,6 @@ eval_frame(PyFrameObject *f)
                                        goto on_error;
                                }
                        }
-#if !defined(HAVE_SIGNAL_H)
-                       /* If we have true signals, the signal handler
-                          will call Py_AddPendingCall() so we don't
-                          have to call PyErr_CheckSignals().  On the 
-                          Mac and DOS, alas, we have to call it. */
-                       if (PyErr_CheckSignals()) {
-                               why = WHY_EXCEPTION;
-                               goto on_error;
-                       }
-#endif
-
 #ifdef WITH_THREAD
                        if (interpreter_lock) {
                                /* Give another thread a chance */

diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index eedb562b3a6b6aae55cc5c6a477e6ed5ed5516d3..224b3c8d66bd87cdc40a6bc749f31ab825fefc14 100644 (file)
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -13,9 +13,7 @@
 #include "eval.h"
 #include "marshal.h"
 
-#ifdef HAVE_SIGNAL_H
 #include <signal.h>
-#endif
 
 #ifdef HAVE_LANGINFO_H
 #include <locale.h>
@@ -1563,7 +1561,6 @@ Py_Exit(int sts)
 static void
 initsigs(void)
 {
-#ifdef HAVE_SIGNAL_H
 #ifdef SIGPIPE
        signal(SIGPIPE, SIG_IGN);
 #endif
@@ -1573,7 +1570,6 @@ initsigs(void)
 #ifdef SIGXFSZ
        signal(SIGXFSZ, SIG_IGN);
 #endif
-#endif /* HAVE_SIGNAL_H */
        PyOS_InitInterrupts(); /* May imply initsignal() */
 }
 

diff --git a/Python/thread.c b/Python/thread.c
index 016ccbab662845da555318f2078f7ff59637b949..8bc958f9cd91c22cd05e09fb95f9fecd808a8222 100644 (file)
--- a/Python/thread.c
+++ b/Python/thread.c
@@ -11,13 +11,7 @@
 #include <stdio.h>
 #endif
 
-#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
-#else
-#ifdef Py_DEBUG
-extern char *getenv(const char *);
-#endif
-#endif
 
 #ifdef __sgi
 #ifndef HAVE_PTHREAD_H /* XXX Need to check in configure.in */

diff --git a/RISCOS/pyconfig.h b/RISCOS/pyconfig.h
index 9d59e83d1640eb09d5ab645eac2cbe0579e568e7..45f87bef259d812bc9f621e92f6ff97422c41d56 100644 (file)
--- a/RISCOS/pyconfig.h
+++ b/RISCOS/pyconfig.h
@@ -1,5 +1,8 @@
 /* RISCOS/pyconfig.h: Python configuration for RISC OS  */
 
+#ifndef Py_PYCONFIG_H
+#define Py_PYCONFIG_H
+
 /* Define if on AIX 3.
    System headers sometimes define this.
    We just want to avoid a redefinition error message.  */
@@ -577,12 +580,6 @@
 /* Define if you have the <libutil.h> header file.  */
 #undef HAVE_LIBUTIL_H
 
-/* Define if you have the <limits.h> header file.  */
-#define HAVE_LIMITS_H 1
-
-/* Define if you have the <locale.h> header file.  */
-#define HAVE_LOCALE_H 1
-
 /* Define if you have the <ncurses.h> header file.  */
 #undef HAVE_NCURSES_H
 
@@ -604,18 +601,6 @@
 /* Define if you have the <pty.h> header file.  */
 #undef HAVE_PTY_H
 
-/* Define if you have the <signal.h> header file.  */
-#define HAVE_SIGNAL_H 1
-
-/* Define if you have the <stdarg.h> header file.  */
-#define HAVE_STDARG_H 1
-
-/* Define if you have the <stddef.h> header file.  */
-#define HAVE_STDDEF_H 1
-
-/* Define if you have the <stdlib.h> header file.  */
-#define HAVE_STDLIB_H 1
-
 /* Define if you have the <sys/audioio.h> header file.  */
 #undef HAVE_SYS_AUDIOIO_H
 
@@ -706,3 +691,5 @@
 #undef DONT_HAVE_SYS_STAT_H
 
 #define PLATFORM "riscos"
+
+#endif /* Py_PYCONFIG_H */

diff --git a/configure b/configure
index a5ffac8ed391ce6e250a0474deef176ed1c1722b..cf2747a7599a19dff106704cc65a9b84a241f3a8 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.450 .
+# From configure.in Revision: 1.451 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.57 for python 2.4.
 #
@@ -4343,15 +4343,9 @@ done
 
 
 
-
-
-
-
-
-
-for ac_header in dlfcn.h fcntl.h grp.h limits.h langinfo.h \
-libintl.h locale.h ncurses.h poll.h pthread.h \
-signal.h stdarg.h stddef.h stdlib.h stropts.h termios.h thread.h \
+for ac_header in 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/param.h sys/poll.h sys/select.h sys/socket.h sys/time.h sys/times.h \

diff --git a/configure.in b/configure.in
index 44a0390b0e46afc1330be4aae1c9bf2031dfcd34..e5495bda5022f6eeb469053f4b88f4712d19badd 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -911,9 +911,9 @@ dnl AC_MSG_RESULT($cpp_type)
 
 # checks for header files
 AC_HEADER_STDC
-AC_CHECK_HEADERS(dlfcn.h fcntl.h grp.h limits.h langinfo.h \
-libintl.h locale.h ncurses.h poll.h pthread.h \
-signal.h stdarg.h stddef.h stdlib.h stropts.h termios.h thread.h \
+AC_CHECK_HEADERS(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/param.h sys/poll.h sys/select.h sys/socket.h sys/time.h sys/times.h \

diff --git a/pyconfig.h.in b/pyconfig.h.in
index 6d422df05e04c17add81412070f48bc48ea10116..e42f807167f0121607cb09906741c401f845e779 100644 (file)
--- a/pyconfig.h.in
+++ b/pyconfig.h.in
@@ -266,15 +266,9 @@
 /* Define to 1 if you have the <libutil.h> header file. */
 #undef HAVE_LIBUTIL_H
 
-/* Define to 1 if you have the <limits.h> header file. */
-#undef HAVE_LIMITS_H
-
 /* Define if you have the 'link' function. */
 #undef HAVE_LINK
 
-/* Define to 1 if you have the <locale.h> header file. */
-#undef HAVE_LOCALE_H
-
 /* Define this if you have the type long long. */
 #undef HAVE_LONG_LONG
 
@@ -416,9 +410,6 @@
 /* Define to 1 if you have the `siginterrupt' function. */
 #undef HAVE_SIGINTERRUPT
 
-/* Define to 1 if you have the <signal.h> header file. */
-#undef HAVE_SIGNAL_H
-
 /* Define to 1 if you have the `sigrelse' function. */
 #undef HAVE_SIGRELSE
 
@@ -437,25 +428,13 @@
 /* Define if you have struct stat.st_mtim.tv_nsec */
 #undef HAVE_STAT_TV_NSEC
 
-/* Define to 1 if you have the <stdarg.h> header file. */
-#undef HAVE_STDARG_H
-
 /* Define if your compiler supports variable length function prototypes (e.g.
    void fprintf(FILE *, char *, ...);) *and* <stdarg.h> */
 #undef HAVE_STDARG_PROTOTYPES
 
-/* Define to 1 if you have the <stddef.h> header file. */
-#undef HAVE_STDDEF_H
-
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the `strdup' function. */
-#undef HAVE_STRDUP
-
 /* Define to 1 if you have the `strerror' function. */
 #undef HAVE_STRERROR
 
@@ -465,9 +444,6 @@
 /* Define to 1 if you have the <strings.h> header file. */
 #undef HAVE_STRINGS_H
 
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
 /* Define to 1 if you have the <stropts.h> header file. */
 #undef HAVE_STROPTS_H