Changes to m4/src/Attic/input.c,v [branch-1_4]

[Eric Blake]

CVSROOT:        /sources/m4
Module name:    m4
Branch:         branch-1_4
Changes by:     Eric Blake <ericb>      07/02/05 13:43:36

Index: src/input.c
===================================================================
RCS file: /sources/m4/m4/src/Attic/input.c,v
retrieving revision 1.1.1.1.2.33
retrieving revision 1.1.1.1.2.34
diff -u -b -r1.1.1.1.2.33 -r1.1.1.1.2.34
--- src/input.c 28 Jan 2007 01:54:44 -0000      1.1.1.1.2.33
+++ src/input.c 5 Feb 2007 13:43:36 -0000       1.1.1.1.2.34
@@ -87,9 +87,9 @@
       struct
        {
          FILE *fp;             /* input file handle */
-         bool end : 1;         /* true if peek has seen EOF */
-         bool close : 1;       /* true if we should close file on pop */
-         bool advance_line : 1; /* track previous start_of_input_line */
+         bool_bitfield end : 1;     /* true if peek has seen EOF */
+         bool_bitfield close : 1;   /* true if we should close file on pop */
+         bool_bitfield advance : 1; /* track previous start_of_input_line */
        }
        u_f;    /* INPUT_FILE */
       builtin_func *func;      /* pointer to macro's function */
@@ -197,7 +197,7 @@
   i->u.u_f.fp = fp;
   i->u.u_f.end = false;
   i->u.u_f.close = close;
-  i->u.u_f.advance_line = start_of_input_line;
+  i->u.u_f.advance = start_of_input_line;
   output_current_line = -1;
 
   i->prev = isp;
@@ -352,7 +352,7 @@
          M4ERROR ((warning_status, errno, "error reading file"));
          retcode = EXIT_FAILURE;
        }
-      start_of_input_line = isp->u.u_f.advance_line;
+      start_of_input_line = isp->u.u_f.advance;
       output_current_line = -1;
       break;