Commit 36b8337d by Kaveh R. Ghazi Committed by Kaveh Ghazi

cccp.c: Don't define MIN/MAX anymore.

        * cccp.c: Don't define MIN/MAX anymore.
        * cpplib.c: Likewise.
        * machmode.h: Likewise.
        * system.h: Provide definitions for MIN/MAX.

From-SVN: r24339
parent 93eba434
Wed Dec 16 12:28:54 1998 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* cccp.c: Don't define MIN/MAX anymore.
* cpplib.c: Likewise.
* machmode.h: Likewise.
* system.h: Provide definitions for MIN/MAX.
Tue Dec 15 23:47:42 1998 Zack Weinberg <zack@rabi.phys.columbia.edu> Tue Dec 15 23:47:42 1998 Zack Weinberg <zack@rabi.phys.columbia.edu>
* fix-header.c: Don't define xstrdup here. * fix-header.c: Don't define xstrdup here.
......
...@@ -87,11 +87,6 @@ static int hack_vms_include_specification (); ...@@ -87,11 +87,6 @@ static int hack_vms_include_specification ();
#define INO_T_EQ(a, b) 0 #define INO_T_EQ(a, b) 0
#endif #endif
#undef MIN
#undef MAX
#define MIN(X,Y) ((X) < (Y) ? (X) : (Y))
#define MAX(X,Y) ((X) > (Y) ? (X) : (Y))
/* Find the largest host integer type and set its size and type. /* Find the largest host integer type and set its size and type.
Watch out: on some crazy hosts `long' is shorter than `int'. */ Watch out: on some crazy hosts `long' is shorter than `int'. */
......
...@@ -45,12 +45,6 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ ...@@ -45,12 +45,6 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
extern char *update_path PARAMS ((char *, char *)); extern char *update_path PARAMS ((char *, char *));
#undef MIN
#undef MAX
#define MIN(X,Y) ((X) < (Y) ? (X) : (Y))
#define MAX(X,Y) ((X) > (Y) ? (X) : (Y))
/* By default, colon separates directories in a path. */ /* By default, colon separates directories in a path. */
#ifndef PATH_SEPARATOR #ifndef PATH_SEPARATOR
#define PATH_SEPARATOR ':' #define PATH_SEPARATOR ':'
......
...@@ -22,17 +22,7 @@ Boston, MA 02111-1307, USA. */ ...@@ -22,17 +22,7 @@ Boston, MA 02111-1307, USA. */
#define HAVE_MACHINE_MODES #define HAVE_MACHINE_MODES
/* Strictly speaking, this isn't the proper place to include these definitions, /* Strictly speaking, this isn't the proper place to include these definitions,
but this file is included by every GCC file. but this file is included by every GCC file. */
Some systems define these in, e.g., param.h. We undefine these names
here to avoid the warnings. We prefer to use our definitions since we
know they are correct. */
#undef MIN
#undef MAX
#define MIN(X,Y) ((X) < (Y) ? (X) : (Y))
#define MAX(X,Y) ((X) > (Y) ? (X) : (Y))
/* Find the largest host integer type and set its size and type. */ /* Find the largest host integer type and set its size and type. */
......
...@@ -171,6 +171,15 @@ extern int errno; ...@@ -171,6 +171,15 @@ extern int errno;
# define O_WRONLY 1 # define O_WRONLY 1
#endif #endif
/* Some systems define these in, e.g., param.h. We undefine these names
here to avoid the warnings. We prefer to use our definitions since we
know they are correct. */
#undef MIN
#undef MAX
#define MIN(X,Y) ((X) < (Y) ? (X) : (Y))
#define MAX(X,Y) ((X) > (Y) ? (X) : (Y))
#ifdef HAVE_SYS_WAIT_H #ifdef HAVE_SYS_WAIT_H
#include <sys/wait.h> #include <sys/wait.h>
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment