[SCM] GNU M4 source repository branch, branch-1.4, updated. v1.4.11-46-gc8c7703

[Eric Blake]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU M4 source repository".

http://git.sv.gnu.org/gitweb/?p=m4.git;a=commitdiff;h=c8c770396a227c4e5e1359134dde14cff681da20

The branch, branch-1.4 has been updated
       via  c8c770396a227c4e5e1359134dde14cff681da20 (commit)
      from  83c399d87ff2bb6f3f69f9a93af4638d53d0037b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c8c770396a227c4e5e1359134dde14cff681da20
Author: Eric Blake <address@hidden>
Date:   Mon Sep 1 07:05:56 2008 -0600

    Fix building with -DDEBUG=1.
    
    * src/input.c (lex_debug) [DEBUG_INPUT]: Fix compilation failure.
    * src/symtab.c (symtab_debug) [DEBUG_SYM]: Likewise.
    * src/m4.c (includes) [DEBUG_STKOVF]: Likewise.
    Reported by Tom G. Christensen.
    
    Signed-off-by: Eric Blake <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog    |    8 ++++++++
 src/input.c  |    4 ++--
 src/m4.c     |    4 ++++
 src/symtab.c |    6 +++---
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 25a15d9..7ffd356 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-09-01  Eric Blake  <address@hidden>
+
+       Fix building with -DDEBUG=1.
+       * src/input.c (lex_debug) [DEBUG_INPUT]: Fix compilation failure.
+       * src/symtab.c (symtab_debug) [DEBUG_SYM]: Likewise.
+       * src/m4.c (includes) [DEBUG_STKOVF]: Likewise.
+       Reported by Tom G. Christensen.
+
 2008-09-01  Ralf Wildenhues  <address@hidden>
 
        Typos in source code comments.
diff --git a/src/input.c b/src/input.c
index 74b5f3f..a9471dc 100644
--- a/src/input.c
+++ b/src/input.c
@@ -1117,7 +1117,7 @@ lex_debug (void)
   token_type t;
   token_data td;
 
-  while ((t = next_token (&td)) != TOKEN_EOF)
+  while ((t = next_token (&td, NULL)) != TOKEN_EOF)
     print_token ("lex", t, &td);
 }
-#endif
+#endif /* DEBUG_INPUT */
diff --git a/src/m4.c b/src/m4.c
index e1f5bb0..ee0fe8a 100644
--- a/src/m4.c
+++ b/src/m4.c
@@ -29,6 +29,10 @@
 #include "progname.h"
 #include "version-etc.h"
 
+#ifdef DEBUG_STKOVF
+# include "assert.h"
+#endif
+
 #define AUTHORS "Rene' Seindal"
 
 static void usage (int);
diff --git a/src/symtab.c b/src/symtab.c
index 872cfaa..b755790 100644
--- a/src/symtab.c
+++ b/src/symtab.c
@@ -1,7 +1,7 @@
 /* GNU m4 -- A simple macro processor
 
-   Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2003, 2006, 2007 Free
-   Software Foundation, Inc.
+   Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2003, 2006, 2007,
+   2008 Free Software Foundation, Inc.
 
    This file is part of GNU M4.
 
@@ -357,7 +357,7 @@ symtab_debug (void)
   int delete;
   static int i;
 
-  while (next_token (&td) == TOKEN_WORD)
+  while (next_token (&td, NULL) == TOKEN_WORD)
     {
       text = TOKEN_DATA_TEXT (&td);
       if (*text == '_')


hooks/post-receive
--
GNU M4 source repository