From 0d2ef5a3ce846a38dc66b8fc3d5dc3ea22ce6bae Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Fri, 20 Feb 2004 22:51:47 +0000
Subject: [PATCH] Fixes for compilation by the Digital Mars Compiler. Submitted
 by Scott Michel.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@5728 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 SWIG/Source/CParse/cscanner.c | 4 ++--
 SWIG/Source/CParse/parser.y   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/SWIG/Source/CParse/cscanner.c b/SWIG/Source/CParse/cscanner.c
index 7408d8b16..160d6c85e 100644
--- a/SWIG/Source/CParse/cscanner.c
+++ b/SWIG/Source/CParse/cscanner.c
@@ -1188,7 +1188,7 @@ int yylex(void) {
 	      return(TEMPLATE);
 	    }
 	    if (strcmp(yytext,"delete") == 0) {
-	      return(DELETE);
+	      return(DELETE_KW);
 	    }
 	    if (strcmp(yytext,"using") == 0) {
 	      return(USING);
@@ -1219,7 +1219,7 @@ int yylex(void) {
 	  /* Misc keywords */
 	  
 	  if (strcmp(yytext,"extern") == 0) return(EXTERN);
-	  if (strcmp(yytext,"const") == 0) return(CONST);
+	  if (strcmp(yytext,"const") == 0) return(CONST_QUAL);
 	  if (strcmp(yytext,"static") == 0) return(STATIC);
 	  if (strcmp(yytext,"struct") == 0) return(STRUCT);
 	  if (strcmp(yytext,"union") == 0) return(UNION);
diff --git a/SWIG/Source/CParse/parser.y b/SWIG/Source/CParse/parser.y
index 40123a757..11d0ba21c 100644
--- a/SWIG/Source/CParse/parser.y
+++ b/SWIG/Source/CParse/parser.y
@@ -871,7 +871,7 @@ Node *Swig_cparse(File *f) {
 %token <ivalue> TYPEDEF
 %token <type> TYPE_INT TYPE_UNSIGNED TYPE_SHORT TYPE_LONG TYPE_FLOAT TYPE_DOUBLE TYPE_CHAR TYPE_VOID TYPE_SIGNED TYPE_BOOL TYPE_TYPEDEF TYPE_RAW
 %token LPAREN RPAREN COMMA SEMI EXTERN INIT LBRACE RBRACE PERIOD
-%token CONST VOLATILE STRUCT UNION EQUAL SIZEOF MODULE LBRACKET RBRACKET
+%token CONST_QUAL VOLATILE STRUCT UNION EQUAL SIZEOF MODULE LBRACKET RBRACKET
 %token ILLEGAL CONSTANT
 %token NAME RENAME NAMEWARN EXTEND PRAGMA FEATURE VARARGS
 %token ENUM
@@ -881,7 +881,7 @@ Node *Swig_cparse(File *f) {
 %token NATIVE INLINE
 %token TYPEMAP EXCEPT ECHO APPLY CLEAR SWIGTEMPLATE FRAGMENT
 %token WARN 
-%token LESSTHAN GREATERTHAN MODULO DELETE
+%token LESSTHAN GREATERTHAN MODULO DELETE_KW
 %token TYPES PARMS
 %token NONID DSTAR DCNOT
 %token <ivalue> TEMPLATE
@@ -4084,7 +4084,7 @@ type_qualifier : type_qualifier_raw {
                }
                ;
 
-type_qualifier_raw :  CONST { $$ = "const"; }
+type_qualifier_raw :  CONST_QUAL { $$ = "const"; }
                    |  VOLATILE { $$ = "volatile"; }
                    ;