[project @ 1999-11-25 11:10:16 by sewardj]

Change STDCALL to STDKALL to avoid conflict with a header file.

diff --git a/ghc/interpreter/input.c b/ghc/interpreter/input.c
index ecc489d..bab8fa7 100644 (file)
--- a/ghc/interpreter/input.c
+++ b/ghc/interpreter/input.c
@@ -9,8 +9,8 @@
  * included in the distribution.
  *
  * $RCSfile: input.c,v $
- * $Revision: 1.12 $
- * $Date: 1999/11/17 16:57:40 $
+ * $Revision: 1.13 $
+ * $Date: 1999/11/25 11:10:16 $
  * ------------------------------------------------------------------------*/
 
 #include "prelude.h"
@@ -1507,7 +1507,7 @@ static Int local yylex() {             /* Read next input token ...        */
         if (it==textExport)            return EXPORT;
         if (it==textDynamic)           return DYNAMIC;
         if (it==textCcall)             return CCALL;
-        if (it==textStdcall)           return STDCALL;
+        if (it==textStdcall)           return STDKALL;
         if (it==textUUExport)          return UUEXPORT;
         if (it==textHiding)            return HIDING;
         if (it==textQualified)         return QUALIFIED;

diff --git a/ghc/interpreter/parser.y b/ghc/interpreter/parser.y
index b91d7d5..aa2d1b9 100644 (file)
--- a/ghc/interpreter/parser.y
+++ b/ghc/interpreter/parser.y
@@ -12,8 +12,8 @@
  * included in the distribution.
  *
  * $RCSfile: parser.y,v $
- * $Revision: 1.13 $
- * $Date: 1999/11/17 16:57:42 $
+ * $Revision: 1.14 $
+ * $Date: 1999/11/25 11:10:17 $
  * ------------------------------------------------------------------------*/
 
 %{
@@ -97,7 +97,7 @@ static Void   local noIP       Args((String));
 %token '['        ';'        ']'        '`'        '.'
 %token TMODULE    IMPORT     HIDING     QUALIFIED  ASMOD
 %token EXPORT     UUEXPORT   INTERFACE  REQUIRES   UNSAFE     
-%token INSTIMPORT DYNAMIC    CCALL      STDCALL
+%token INSTIMPORT DYNAMIC    CCALL      STDKALL
 
 %%
 /*- Top level script/module structure -------------------------------------*/
@@ -637,7 +637,7 @@ topDecl   : FOREIGN IMPORT callconv ext_loc ext_name unsafe_flag var COCO type
          ;
 
 callconv  : CCALL                {$$ = gc1(textCcall);}
-          | STDCALL              {$$ = gc1(textStdcall);}
+          | STDKALL              {$$ = gc1(textStdcall);}
           | /* empty */          {$$ = gc0(NIL);}
           ;
 ext_loc   : STRINGLIT            {$$ = $1;}