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 f552a28..eb2dab6 100644 (file)
--- a/bin/csh/char.c
+++ b/bin/csh/char.c
@@ -63,10 +63,10 @@ unsigned short _cmap[256] = {
        _CTR,           _CTR,           _CTR,           _CTR,
 
 /*     sp              !               "               #       */
        _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,
 
 /*     (               )               *               +       */
        _META|_CMD,     _META,          _GLOB,          0,

diff --git a/bin/csh/char.h b/bin/csh/char.h
index 297a6ee..4754368 100644 (file)
--- a/bin/csh/char.h
+++ b/bin/csh/char.h
@@ -42,7 +42,7 @@ extern unsigned char _cmap_lower[], _cmap_upper[];
 
 #endif
 
 
 #endif
 

-#define        _Q      0x0001          /* '" */
+#define        _Q2     0x0001          /* '" */

 #define        _Q1     0x0002          /* ` */
 #define        _SP     0x0004          /* space and tab */
 #define        _NL     0x0008          /* \n */
 #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 d2b28f5..816b458 100644 (file)
--- 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        unDgetC(c)      Dpeekc = c
 

-#define QUOTES         (_Q|_Q1|_ESC)   /* \ ' " ` */
+#define QUOTES         (_Q2|_Q1|_ESC)  /* \ ' " ` */

 
 /*
  * The following variables give the information about the current
 
 /*
  * The following variables give the information about the current


@@ -192,7 +192,7 @@ Dpack(wbuf, wp)
            Gcat(STRNULL, wbuf);
            return (NULL);
        }
            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);
            unDgetC(c);
            if (cmap(c, QUOTES))
                return (wp);

diff --git a/bin/csh/lex.c b/bin/csh/lex.c
index 63af5da..75fb7e3 100644 (file)
--- a/bin/csh/lex.c
+++ b/bin/csh/lex.c
@@ -315,7 +315,7 @@ loop:
                break;
            }
        }
                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') {
            if (c == '\\') {
                c = getC(0);
                if (c == '\n') {


@@ -327,7 +327,7 @@ loop:
                    *wp++ = '\\', --i;
                c |= QUOTE;
            }
                    *wp++ = '\\', --i;
                c |= QUOTE;
            }

-           else if (cmap(c, _Q | _Q1)) {       /* '"` */
+           else if (cmap(c, _Q2 | _Q1)) {      /* '"` */

                c1 = c;
                dolflg = c == '"' ? DOALL : DOEXCL;
            }
                c1 = c;
                dolflg = c == '"' ? DOALL : DOEXCL;
            }


@@ -366,7 +366,7 @@ getC1(flag)
            if ((c = *lap++) == 0)
                lap = 0;
            else {
            if ((c = *lap++) == 0)
                lap = 0;
            else {

-               if (cmap(c, _META | _Q | _Q1))
+               if (cmap(c, _META | _Q2 | _Q1))

                    c |= QUOTE;
                return (c);
            }
                    c |= QUOTE;
                return (c);
            }