-struct input_save
- {
- char *buffer_start;
- char *partial_where;
- int partial_size;
- char save_source[AFTER_SIZE];
- unsigned int buffer_length;
- char *physical_input_file;
- char *logical_input_file;
- line_numberT physical_input_line;
- int logical_input_line;
- int sb_index;
- sb from_sb;
- struct input_save *next_saved_file; /* Chain of input_saves */
- char *input_file_save; /* Saved state of input routines */
- char *saved_position; /* Caller's saved position in buf */
- };
-
-static struct input_save *input_scrub_push PARAMS ((char *saved_position));
-static char *input_scrub_pop PARAMS ((struct input_save *arg));
-static void as_1_char PARAMS ((unsigned int c, FILE * stream));
+struct input_save {
+ char * buffer_start;
+ char * partial_where;
+ size_t partial_size;
+ char save_source[AFTER_SIZE];
+ size_t buffer_length;
+ const char * physical_input_file;
+ const char * logical_input_file;
+ unsigned int physical_input_line;
+ int logical_input_line;
+ size_t sb_index;
+ sb from_sb;
+ int from_sb_is_expansion; /* Should we do a conditional check? */
+ struct input_save * next_saved_file; /* Chain of input_saves. */
+ char * input_file_save; /* Saved state of input routines. */
+ char * saved_position; /* Caller's saved position in buf. */
+};
+
+static struct input_save *input_scrub_push (char *saved_position);
+static char *input_scrub_pop (struct input_save *arg);