31-fyi-m4-symbol-lookup-t.patch

[Akim Demaille]

Otherwise I have conflicts with the names I'm introducing, and it
makes my life harder.

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * m4/m4module.h (m4_symbol_lookup): Rename as...
        (m4_symbol_lookup_t): this.

Index: m4/builtin.c
--- m4/builtin.c Mon, 03 Sep 2001 15:40:52 +0200 akim
+++ m4/builtin.c Tue, 04 Sep 2001 10:16:31 +0200 akim
@@ -76,7 +76,7 @@
    NAME is to be traced.  */
 void
 m4_builtin_define (const lt_dlhandle handle, const char *name,
-                  const m4_builtin *bp, m4_symbol_lookup mode,
+                  const m4_builtin *bp, m4_symbol_lookup_t mode,
                   boolean traced)
 {
   m4_symbol *symbol;
@@ -121,7 +121,7 @@
    It is also used from main ().  */
 void
 m4_macro_define (const lt_dlhandle handle, const char *name,
-                const char *text, m4_symbol_lookup mode)
+                const char *text, m4_symbol_lookup_t mode)
 {
   m4_symbol *symbol;

Index: m4/m4module.h
--- m4/m4module.h Tue, 04 Sep 2001 09:54:08 +0200 akim
+++ m4/m4module.h Tue, 04 Sep 2001 10:16:31 +0200 akim
@@ -57,7 +57,7 @@
   M4_SYMBOL_DELETE,
   M4_SYMBOL_PUSHDEF,
   M4_SYMBOL_POPDEF,
-} m4_symbol_lookup;
+} m4_symbol_lookup_t;

 typedef struct {
   const char *name;
@@ -87,13 +87,13 @@


 extern void m4_macro_define            (const lt_dlhandle,
-                               const char *, const char *, m4_symbol_lookup);
+                               const char *, const char *, m4_symbol_lookup_t);
 extern void m4_macro_table_install     (
                                const lt_dlhandle, const m4_macro *);

 extern void m4_builtin_define          (const lt_dlhandle,
                                const char *, const m4_builtin *,
-                               m4_symbol_lookup, boolean);
+                               m4_symbol_lookup_t, boolean);
 extern void m4_builtin_table_install   (
                                const lt_dlhandle, const m4_builtin *);

@@ -105,7 +105,7 @@
 extern m4_hash *m4_symtab;

 extern void    m4_symtab_init          (void);
-extern m4_symbol *m4_lookup_symbol     (const char *, m4_symbol_lookup);
+extern m4_symbol *m4_lookup_symbol     (const char *, m4_symbol_lookup_t);
 extern int     m4_symtab_apply (m4_symtab_apply_func *, void *);
 extern void    m4_remove_table_reference_symbols (lt_dlhandle);

Index: m4/symtab.c
--- m4/symtab.c Tue, 04 Sep 2001 09:54:08 +0200 akim
+++ m4/symtab.c Tue, 04 Sep 2001 10:16:31 +0200 akim
@@ -134,7 +134,7 @@
    occurrence of the name on the list or delete all occurences of the name
    on the list.  */
 m4_symbol *
-m4_lookup_symbol (const char *name, m4_symbol_lookup mode)
+m4_lookup_symbol (const char *name, m4_symbol_lookup_t mode)
 {
   m4_symbol **psymbol = (m4_symbol **) m4_hash_lookup (m4_symtab, name);

@@ -205,7 +205,7 @@
     }

   M4ERROR ((warning_status, 0,
-           _("INTERNAL ERROR: Illegal mode to m4_symbol_lookup (%s, %d)"),
+           _("INTERNAL ERROR: Illegal mode to m4_symbol_lookup_t (%s, %d)"),
            name, mode));
   abort ();
   /*NOTREACHED*/
Index: modules/m4.c
--- modules/m4.c Mon, 03 Sep 2001 15:40:52 +0200 akim
+++ modules/m4.c Tue, 04 Sep 2001 10:16:31 +0200 akim
@@ -132,7 +132,7 @@
    symbol table.  */

 static void
-macro_install (int argc, m4_token_data **argv, m4_symbol_lookup mode)
+macro_install (int argc, m4_token_data **argv, m4_symbol_lookup_t mode)
 {
   if (m4_bad_argc (argv[0], argc, 2, 3))
     return;