From: Andreas Schulz <ats@g386bsd.first.bmd.de>
Date: Thu, 7 Apr 1994 14:34:25 +0000 (+0000)
Subject: Changed a macro name from _Q to _Q2 to avoid a clash with the
X-Git-Tag: FreeBSD-release/1.1.5~994
X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/commitdiff_plain/445ac689450ff370ea2d59bcd4baeda03c562e5d

Changed a macro name from _Q to _Q2 to avoid a clash with the
newly introduced _Q macro in ctype.h.
---

diff --git a/bin/csh/char.c b/bin/csh/char.c
index f552a28684..eb2dab68bf 100644
--- a/bin/csh/char.c
+++ b/bin/csh/char.c
@@ -63,10 +63,10 @@ unsigned short _cmap[256] = {
 	_CTR,		_CTR,		_CTR,		_CTR,
 
 /*	sp		!		"		#	*/
-	_SP|_META,	0,		_Q,		_META,
+	_SP|_META,	0,		_Q2,		_META,
 
 /*	$		%		&		'	*/
-	_DOL,		0,		_META|_CMD,	_Q,
+	_DOL,		0,		_META|_CMD,	_Q2,
 
 /*	(		)		*		+	*/
 	_META|_CMD,	_META,		_GLOB,		0,
diff --git a/bin/csh/char.h b/bin/csh/char.h
index 297a6ee8e1..4754368791 100644
--- a/bin/csh/char.h
+++ b/bin/csh/char.h
@@ -42,7 +42,7 @@ extern unsigned char _cmap_lower[], _cmap_upper[];
 
 #endif
 
-#define	_Q	0x0001		/* '" */
+#define	_Q2	0x0001		/* '" */
 #define	_Q1	0x0002		/* ` */
 #define	_SP	0x0004		/* space and tab */
 #define	_NL	0x0008		/* \n */
diff --git a/bin/csh/dol.c b/bin/csh/dol.c
index d2b28f5433..816b458406 100644
--- a/bin/csh/dol.c
+++ b/bin/csh/dol.c
@@ -66,7 +66,7 @@ static Char *Dcp, **Dvp;	/* Input vector for Dreadc */
 
 #define	unDgetC(c)	Dpeekc = c
 
-#define QUOTES		(_Q|_Q1|_ESC)	/* \ ' " ` */
+#define QUOTES		(_Q2|_Q1|_ESC)	/* \ ' " ` */
 
 /*
  * The following variables give the information about the current
@@ -192,7 +192,7 @@ Dpack(wbuf, wp)
 	    Gcat(STRNULL, wbuf);
 	    return (NULL);
 	}
-	if (cmap(c, _SP | _NL | _Q | _Q1)) {	/* sp \t\n'"` */
+	if (cmap(c, _SP | _NL | _Q2 | _Q1)) {	/* sp \t\n'"` */
 	    unDgetC(c);
 	    if (cmap(c, QUOTES))
 		return (wp);
diff --git a/bin/csh/lex.c b/bin/csh/lex.c
index 63af5da774..75fb7e3a7f 100644
--- a/bin/csh/lex.c
+++ b/bin/csh/lex.c
@@ -315,7 +315,7 @@ loop:
 		break;
 	    }
 	}
-	else if (cmap(c, _META | _Q | _Q1 | _ESC)) {
+	else if (cmap(c, _META | _Q2 | _Q1 | _ESC)) {
 	    if (c == '\\') {
 		c = getC(0);
 		if (c == '\n') {
@@ -327,7 +327,7 @@ loop:
 		    *wp++ = '\\', --i;
 		c |= QUOTE;
 	    }
-	    else if (cmap(c, _Q | _Q1)) {	/* '"` */
+	    else if (cmap(c, _Q2 | _Q1)) {	/* '"` */
 		c1 = c;
 		dolflg = c == '"' ? DOALL : DOEXCL;
 	    }
@@ -366,7 +366,7 @@ getC1(flag)
 	    if ((c = *lap++) == 0)
 		lap = 0;
 	    else {
-		if (cmap(c, _META | _Q | _Q1))
+		if (cmap(c, _META | _Q2 | _Q1))
 		    c |= QUOTE;
 		return (c);
 	    }