Merge remote-tracking branch 'upstream/master' into a5200

[cc65] / src / cc65 / macrotab.h

diff --git a/src/cc65/macrotab.h b/src/cc65/macrotab.h
index 957b8c4045c25f7a55ed67389fdce0885240ac57..746fc6f89269e4e88e93a4c173d6d4a66756984c 100644 (file)
--- a/src/cc65/macrotab.h
+++ b/src/cc65/macrotab.h
@@ -1,15 +1,15 @@
 /*****************************************************************************/
 /*                                                                           */
-/*                               macrotab.h                                 */
+/*                                macrotab.h                                 */
 /*                                                                           */
-/*            Preprocessor macro table for the cc65 C compiler              */
+/*             Preprocessor macro table for the cc65 C compiler              */
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2000-2004 Ullrich von Bassewitz                                       */
-/*               Römerstraße 52                                              */
-/*               D-70794 Filderstadt                                         */
-/* EMail:        uz@cc65.org                                                 */
+/* (C) 2000-2005, Ullrich von Bassewitz                                      */
+/*                Römerstraße 52                                             */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -46,7 +46,7 @@
 
 
 /*****************************************************************************/
-/*                                  data                                    */
+/*                                   data                                    */
 /*****************************************************************************/
 
 
@@ -54,19 +54,20 @@
 /* Structure describing a macro */
 typedef struct Macro Macro;
 struct Macro {
-    Macro*      Next;          /* Next macro with same hash value */
-    int          Expanding;     /* Are we currently expanding this macro? */
-    int                 ArgCount;      /* Number of parameters, -1 = no parens */
-    unsigned    MaxArgs;       /* Size of formal argument list */
-    Collection   FormalArgs;   /* Formal argument list (char*) */
-    StrBuf       Replacement;   /* Replacement text */
-    char        Name[1];       /* Name, dynamically allocated */
+    Macro*        Next;         /* Next macro with same hash value */
+    int           Expanding;    /* Are we currently expanding this macro? */
+    int           ArgCount;     /* Number of parameters, -1 = no parens */
+    unsigned      MaxArgs;      /* Size of formal argument list */
+    Collection    FormalArgs;   /* Formal argument list (char*) */
+    StrBuf        Replacement;  /* Replacement text */
+    unsigned char Variadic;     /* C99 variadic macro */
+    char          Name[1];      /* Name, dynamically allocated */
 };
 
 
 
 /*****************************************************************************/
-/*                                  Code                                    */
+/*                                   Code                                    */
 /*****************************************************************************/
 
 
@@ -126,7 +127,5 @@ void PrintMacroStats (FILE* F);
 
 
 /* End of macrotab.h */
-#endif
-
-
 
+#endif