Rationalize use of limits.h, moving the inclusion to Python.h.

Add definitions of INT_MAX and LONG_MAX to pyport.h.
Remove includes of limits.h and conditional definitions of INT_MAX
and LONG_MAX elsewhere.

This closes SourceForge patch #101659 and bug #115323.
This commit is contained in:
Fred Drake 2000-09-26 05:46:01 +00:00
parent 1b6185941e
commit d5fadf75e4
25 changed files with 42 additions and 133 deletions

View file

@ -15,7 +15,6 @@ This software comes with no warranty. Use at your own risk.
#include <errno.h>
#include <locale.h>
#include <string.h>
#include <limits.h>
#include <ctype.h>
#if defined(MS_WIN32)

View file

@ -40,12 +40,6 @@ char copyright[] = " SRE 0.9.8 Copyright (c) 1997-2000 by Secret Labs AB ";
#include "sre.h"
#if defined(HAVE_LIMITS_H)
#include <limits.h>
#else
#define INT_MAX 2147483647
#endif
#include <ctype.h>
/* name of this module, minus the leading underscore */

View file

@ -12,9 +12,6 @@
#include <sys/types.h> /* For size_t */
#endif /* DONT_HAVE_SYS_TYPES_H */
#endif /* !STDC_HEADERS */
#ifdef HAVE_LIMITS_H
#include <limits.h>
#endif /* HAVE_LIMITS_H */
struct arrayobject; /* Forward */

View file

@ -33,21 +33,14 @@ typedef unsigned char *POINTER;
/* UINT2 defines a two byte word */
typedef unsigned short int UINT2;
#ifdef HAVE_LIMITS_H
#include <limits.h>
#else
/* Wild guess */
#define LONG_MAX 2147483647L
#endif
/* UINT4 defines a four byte word */
#if defined(INT_MAX) && INT_MAX == 2147483647
typedef unsigned int UINT4;
#else
#if defined(LONG_MAX) && LONG_MAX == 2147483647L
#if SIZEOF_LONG == 4
typedef unsigned long int UINT4;
#else
#if INT_MAX == 2147483647
typedef unsigned int UINT4;
#endif
/* Too bad if neither is */
/* Too bad if neither is; pyport.h would need to be fixed. */
#endif
/* ========== End global.h; continue md5.h ========== */

View file

@ -12,9 +12,6 @@
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#ifdef HAVE_LIMITS_H
#include <limits.h>
#endif
#ifdef HAVE_POLL_H
#include <poll.h>
#endif

View file

@ -9,12 +9,6 @@ this module directly.";
#include "Python.h"
#ifdef HAVE_LIMITS_H
#include <limits.h>
#else
#define INT_MAX 2147483647
#endif
#include <ctype.h>
/* XXX This file assumes that the <ctype.h> is*() functions
XXX are defined for all 8-bit characters! */

View file

@ -31,7 +31,6 @@ The variable struct.error is an exception raised on errors.";
#include "Python.h"
#include <limits.h>
#include <ctype.h>