* ch-exp.y (MAX, MIN): Rename to MAX_TOKEN, MIN_TOKEN.

* target.c (MIN):  #undef before defining.

gdb/ChangeLog

@@ -1,3 +1,8 @@
+Mon May 10 19:38:34 1993  John Gilmore  (gnu@cygnus.com)
+
+	* ch-exp.y (MAX, MIN):  Rename to MAX_TOKEN, MIN_TOKEN.
+	* target.c (MIN):  #undef before defining.
+
 Mon May 10 16:03:03 1993  Jim Kingdon  (kingdon@cygnus.com)
 
         Patch from Jeffrey Law:
@@ -39,6 +44,7 @@ Sat May  8 01:39:30 1993  (pes@regent.e-technik.tu-muenchen.de)
 	* coffread.c (read_coff_symtab): Don't fclose stream as it is no
 	longer opened twice.
 
+>>>>>>> 1.1257
 Thu May  6 21:08:55 1993  Jim Kingdon  (kingdon@cygnus.com)
 
 	* solib.c (clear_solib): Don't close bfd if it is NULL.

gdb/ch-exp.y

@@ -1,5 +1,5 @@
 /* YACC grammar for Chill expressions, for GDB.
-   Copyright (C) 1992 Free Software Foundation, Inc.
+   Copyright 1992, 1993 Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -227,8 +227,8 @@ yyerror PARAMS ((char *));
 %token <voidval>	SUCC
 %token <voidval>	ABS
 %token <voidval>	CARD
-%token <voidval>	MAX
+%token <voidval>	MAX_TOKEN
-%token <voidval>	MIN
+%token <voidval>	MIN_TOKEN
 %token <voidval>	SIZE
 %token <voidval>	UPPER
 %token <voidval>	LOWER
@@ -889,11 +889,11 @@ chill_value_built_in_routine_call :
 			{
 			  $$ = 0;	/* FIXME */
 			}
-		|	MAX '(' expression ')'
+		|	MAX_TOKEN '(' expression ')'
 			{
 			  $$ = 0;	/* FIXME */
 			}
-		|	MIN '(' expression ')'
+		|	MIN_TOKEN '(' expression ')'
 			{
 			  $$ = 0;	/* FIXME */
 			}
@@ -1739,8 +1739,8 @@ static const struct token idtokentab[] =
     { "orif", ORIF },
     { "num", NUM },
     { "abs", ABS },
-    { "max", MAX },
+    { "max", MAX_TOKEN },
-    { "min", MIN },
+    { "min", MIN_TOKEN },
     { "mod", MOD },
     { "rem", REM },
     { "not", NOT },