From 57ffffe3fe09fb8ffbee62a4ef2c7cb9634c3a6f Mon Sep 17 00:00:00 2001
From: John Gilmore <gnu@cygnus>
Date: Tue, 11 May 1993 02:49:40 +0000
Subject: * ch-exp.y (MAX, MIN):  Rename to MAX_TOKEN, MIN_TOKEN. * target.c
 (MIN):  #undef before defining.

---
 gdb/ch-exp.y | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'gdb/ch-exp.y')

diff --git a/gdb/ch-exp.y b/gdb/ch-exp.y
index a618283..b35fe87 100644
--- a/gdb/ch-exp.y
+++ b/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>	MIN
+%token <voidval>	MAX_TOKEN
+%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 },
-    { "min", MIN },
+    { "max", MAX_TOKEN },
+    { "min", MIN_TOKEN },
     { "mod", MOD },
     { "rem", REM },
     { "not", NOT },
-- 
cgit v1.1