Enlist the FreeBSD-CURRENT users as testers of what is to become Gcc 3.1.0.

These bits are taken from the FSF anoncvs repo on 1-Feb-2002 08:20 PST.

1 files changed, 470 insertions, 639 deletions

diff --git a/contrib/gcc/cpplib.h b/contrib/gcc/cpplib.h
index aadec44..eeeecc0 100644
--- a/contrib/gcc/cpplib.h
+++ b/contrib/gcc/cpplib.h
@@ -1,5 +1,6 @@
 /* Definitions for CPP library.
-   Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+   Free Software Foundation, Inc.
    Written by Per Bothner, 1994-95.
 
 This program is free software; you can redistribute it and/or modify it
@@ -19,752 +20,582 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  In other words, you are welcome to use, share and improve this program.
  You are forbidden to forbid anyone else to use, share and improve
  what you give them.   Help stamp out software-hoarding!  */
-#ifndef __GCC_CPPLIB__
-#define __GCC_CPPLIB__
+#ifndef GCC_CPPLIB_H
+#define GCC_CPPLIB_H
 
 #include <sys/types.h>
+#include "hashtable.h"
+#include "line-map.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-typedef unsigned char U_CHAR;
-
+/* For complex reasons, cpp_reader is also typedefed in c-pragma.h.  */
+#ifndef GCC_C_PRAGMA_H
 typedef struct cpp_reader cpp_reader;
+#endif
 typedef struct cpp_buffer cpp_buffer;
 typedef struct cpp_options cpp_options;
-typedef struct hashnode cpp_hashnode;
-
-enum cpp_token {
-  CPP_EOF = -1,
-  CPP_OTHER = 0,
-  CPP_COMMENT = 1,
-  CPP_HSPACE,
-  CPP_VSPACE, /* newlines and #line directives */
-  CPP_NAME,
-  CPP_NUMBER,
-  CPP_CHAR,
-  CPP_STRING,
-  CPP_DIRECTIVE,
-  CPP_LPAREN,   /* "(" */
-  CPP_RPAREN,   /* ")" */
-  CPP_LBRACE,   /* "{" */
-  CPP_RBRACE,   /* "}" */
-  CPP_COMMA,    /* "," */
-  CPP_SEMICOLON,/* ";" */
-  CPP_3DOTS,    /* "..." */
-#if 0
-  CPP_ANDAND, /* "&&" */
-  CPP_OROR,   /* "||" */
-  CPP_LSH,    /* "<<" */
-  CPP_RSH,    /* ">>" */
-  CPP_EQL,    /* "==" */
-  CPP_NEQ,    /* "!=" */
-  CPP_LEQ,    /* "<=" */
-  CPP_GEQ,    /* ">=" */
-  CPP_PLPL,   /* "++" */
-  CPP_MINMIN, /* "--" */
-#endif
-  /* POP_TOKEN is returned when we've popped a cpp_buffer. */
-  CPP_POP
-};
-
-typedef enum cpp_token (*parse_underflow_t) PARAMS((cpp_reader *));
-typedef int (*parse_cleanup_t) PARAMS((cpp_buffer *, cpp_reader *));
-
-extern void parse_set_mark	PARAMS ((cpp_reader *));
-extern void parse_clear_mark	PARAMS ((cpp_reader *));
-extern void parse_goto_mark	PARAMS ((cpp_reader *));
-
-extern int cpp_handle_option PARAMS ((cpp_reader *, int, char **));
-extern int cpp_handle_options PARAMS ((cpp_reader *, int, char **));
-extern enum cpp_token cpp_get_token PARAMS ((cpp_reader *));
-extern void cpp_skip_hspace PARAMS((cpp_reader *));
-extern enum cpp_token cpp_get_non_space_token PARAMS ((cpp_reader *));
+typedef struct cpp_token cpp_token;
+typedef struct cpp_string cpp_string;
+typedef struct cpp_hashnode cpp_hashnode;
+typedef struct cpp_macro cpp_macro;
+typedef struct cpp_callbacks cpp_callbacks;
 
-/* This frees resources used by PFILE. */
-extern void cpp_cleanup PARAMS ((cpp_reader *PFILE));
+struct answer;
+struct file_name_map_list;
 
-struct cpp_buffer
+/* The first two groups, apart from '=', can appear in preprocessor
+   expressions.  This allows a lookup table to be implemented in
+   _cpp_parse_expr.
+
+   The first group, to CPP_LAST_EQ, can be immediately followed by an
+   '='.  The lexer needs operators ending in '=', like ">>=", to be in
+   the same order as their counterparts without the '=', like ">>".  */
+
+/* Positions in the table.  */
+#define CPP_LAST_EQ CPP_MAX
+#define CPP_FIRST_DIGRAPH CPP_HASH
+#define CPP_LAST_PUNCTUATOR CPP_DOT_STAR
+
+#define TTYPE_TABLE				\
+  OP(CPP_EQ = 0,	"=")			\
+  OP(CPP_NOT,		"!")			\
+  OP(CPP_GREATER,	">")	/* compare */	\
+  OP(CPP_LESS,		"<")			\
+  OP(CPP_PLUS,		"+")	/* math */	\
+  OP(CPP_MINUS,		"-")			\
+  OP(CPP_MULT,		"*")			\
+  OP(CPP_DIV,		"/")			\
+  OP(CPP_MOD,		"%")			\
+  OP(CPP_AND,		"&")	/* bit ops */	\
+  OP(CPP_OR,		"|")			\
+  OP(CPP_XOR,		"^")			\
+  OP(CPP_RSHIFT,	">>")			\
+  OP(CPP_LSHIFT,	"<<")			\
+  OP(CPP_MIN,		"<?")	/* extension */	\
+  OP(CPP_MAX,		">?")			\
+\
+  OP(CPP_COMPL,		"~")			\
+  OP(CPP_AND_AND,	"&&")	/* logical */	\
+  OP(CPP_OR_OR,		"||")			\
+  OP(CPP_QUERY,		"?")			\
+  OP(CPP_COLON,		":")			\
+  OP(CPP_COMMA,		",")	/* grouping */	\
+  OP(CPP_OPEN_PAREN,	"(")			\
+  OP(CPP_CLOSE_PAREN,	")")			\
+  OP(CPP_EQ_EQ,		"==")	/* compare */	\
+  OP(CPP_NOT_EQ,	"!=")			\
+  OP(CPP_GREATER_EQ,	">=")			\
+  OP(CPP_LESS_EQ,	"<=")			\
+\
+  OP(CPP_PLUS_EQ,	"+=")	/* math */	\
+  OP(CPP_MINUS_EQ,	"-=")			\
+  OP(CPP_MULT_EQ,	"*=")			\
+  OP(CPP_DIV_EQ,	"/=")			\
+  OP(CPP_MOD_EQ,	"%=")			\
+  OP(CPP_AND_EQ,	"&=")	/* bit ops */	\
+  OP(CPP_OR_EQ,		"|=")			\
+  OP(CPP_XOR_EQ,	"^=")			\
+  OP(CPP_RSHIFT_EQ,	">>=")			\
+  OP(CPP_LSHIFT_EQ,	"<<=")			\
+  OP(CPP_MIN_EQ,	"<?=")	/* extension */	\
+  OP(CPP_MAX_EQ,	">?=")			\
+  /* Digraphs together, beginning with CPP_FIRST_DIGRAPH.  */	\
+  OP(CPP_HASH,		"#")	/* digraphs */	\
+  OP(CPP_PASTE,		"##")			\
+  OP(CPP_OPEN_SQUARE,	"[")			\
+  OP(CPP_CLOSE_SQUARE,	"]")			\
+  OP(CPP_OPEN_BRACE,	"{")			\
+  OP(CPP_CLOSE_BRACE,	"}")			\
+  /* The remainder of the punctuation.  Order is not significant.  */	\
+  OP(CPP_SEMICOLON,	";")	/* structure */	\
+  OP(CPP_ELLIPSIS,	"...")			\
+  OP(CPP_PLUS_PLUS,	"++")	/* increment */	\
+  OP(CPP_MINUS_MINUS,	"--")			\
+  OP(CPP_DEREF,		"->")	/* accessors */	\
+  OP(CPP_DOT,		".")			\
+  OP(CPP_SCOPE,		"::")			\
+  OP(CPP_DEREF_STAR,	"->*")			\
+  OP(CPP_DOT_STAR,	".*")			\
+  OP(CPP_ATSIGN,	"@")  /* used in Objective C */ \
+\
+  TK(CPP_NAME,		SPELL_IDENT)	/* word */			\
+  TK(CPP_NUMBER,	SPELL_NUMBER)	/* 34_be+ta  */			\
+\
+  TK(CPP_CHAR,		SPELL_STRING)	/* 'char' */			\
+  TK(CPP_WCHAR,		SPELL_STRING)	/* L'char' */			\
+  TK(CPP_OTHER,		SPELL_CHAR)	/* stray punctuation */		\
+\
+  TK(CPP_STRING,	SPELL_STRING)	/* "string" */			\
+  TK(CPP_WSTRING,	SPELL_STRING)	/* L"string" */			\
+  TK(CPP_HEADER_NAME,	SPELL_STRING)	/* <stdio.h> in #include */	\
+\
+  TK(CPP_COMMENT,	SPELL_NUMBER)	/* Only if output comments.  */ \
+                                        /* SPELL_NUMBER happens to DTRT.  */ \
+  TK(CPP_MACRO_ARG,	SPELL_NONE)	/* Macro argument.  */		\
+  TK(CPP_PADDING,	SPELL_NONE)	/* Whitespace for cpp0.  */	\
+  TK(CPP_EOF,		SPELL_NONE)	/* End of line or file.  */
+
+#define OP(e, s) e,
+#define TK(e, s) e,
+enum cpp_ttype
 {
-  unsigned char *cur;	 /* current position */
-  unsigned char *rlimit; /* end of valid data */
-  unsigned char *buf;	 /* entire buffer */
-  unsigned char *alimit; /* end of allocated buffer */
-  unsigned char *line_base; /* start of current line */
-
-  struct cpp_buffer *prev;
-
-  /* Real filename.  (Alias to ->ihash->fname, obsolete). */
-  char *fname;
-  /* Filename specified with #line command.  */
-  char *nominal_fname;
-  /* Last filename specified with #line command.  */
-  char *last_nominal_fname;
-  /* Actual directory of this file, used only for "" includes */
-  struct file_name_list *actual_dir;
-
-  /* Pointer into the include hash table.  Used for include_next and
-     to record control macros. */
-  struct include_hash *ihash;
-
-  long lineno; /* Line number at CPP_LINE_BASE. */
-  long colno; /* Column number at CPP_LINE_BASE. */
-  long mark;  /* Saved position for lengthy backtrack. */
-  parse_underflow_t underflow;
-  parse_cleanup_t cleanup;
-  void *data;
-  
-  /* Value of if_stack at start of this file.
-     Used to prohibit unmatched #endif (etc) in an include file.  */
-  struct if_stack *if_stack;
-
-  /* True if this is a header file included using <FILENAME>.  */
-  char system_header_p;
-  char seen_eof;
-
-  /* True if buffer contains escape sequences.
-     Currently there are two kinds:
-     "\r-" means following identifier should not be macro-expanded.
-     "\r " means a token-separator.  This turns into " " in final output
-          if not stringizing and needed to separate tokens; otherwise nothing.
-     Any other two-character sequence beginning with \r is an error.
-
-     If this is NOT set, then \r is a one-character escape meaning backslash
-     newline.  This is guaranteed not to occur in the middle of a token.
-     The two interpretations of \r do not conflict, because the two-character
-     escapes are used only in macro buffers, and backslash-newline is removed
-     from macro expansion text in collect_expansion and/or macarg.  */
-  char has_escapes;
+  TTYPE_TABLE
+  N_TTYPES
 };
+#undef OP
+#undef TK
 
-struct file_name_map_list;
-
-/* Maximum nesting of cpp_buffers.  We use a static limit, partly for
-   efficiency, and partly to limit runaway recursion.  */
-#define CPP_STACK_MAX 200
+/* C language kind, used when calling cpp_reader_init.  */
+enum c_lang {CLK_GNUC89 = 0, CLK_GNUC99, CLK_STDC89, CLK_STDC94, CLK_STDC99,
+	     CLK_GNUCXX, CLK_CXX98, CLK_OBJC, CLK_OBJCXX, CLK_ASM};
 
-/* A cpp_reader encapsulates the "state" of a pre-processor run.
-   Applying cpp_get_token repeatedly yields a stream of pre-processor
-   tokens.  Usually, there is only one cpp_reader object active. */
-
-struct cpp_reader
+/* Payload of a NUMBER, STRING, CHAR or COMMENT token.  */
+struct cpp_string
 {
-  parse_underflow_t get_token;
-  cpp_buffer *buffer;
-  cpp_options *opts;
-
-  /* A buffer used for both for cpp_get_token's output, and also internally. */
-  unsigned char *token_buffer;
-  /* Allocated size of token_buffer.  CPP_RESERVE allocates space.  */
-  unsigned int token_buffer_size;
-  /* End of the written part of token_buffer. */
-  unsigned char *limit;
-
-  /* Error counter for exit code */
-  int errors;
-
-  /* Line where a newline was first seen in a string constant.  */
-  int multiline_string_line;
-
-  /* Current depth in #include directives that use <...>.  */
-  int system_include_depth;
-
-  /* Current depth of buffer stack. */
-  int buffer_stack_depth;
-
-  /* Hash table of macros and assertions.  See cpphash.c */
-#define HASHSIZE 1403
-  struct hashnode **hashtab;
-  
-  /* Hash table of other included files.  See cppfiles.c */
-#define ALL_INCLUDE_HASHSIZE 71
-  struct include_hash *all_include_files[ALL_INCLUDE_HASHSIZE];
-
-  /* Chain of `actual directory' file_name_list entries,
-     for "" inclusion. */
-  struct file_name_list *actual_dirs;
-
-  /* Current maximum length of directory names in the search path
-     for include files.  (Altered as we get more of them.)  */
-  unsigned int max_include_len;
-
-  struct if_stack *if_stack;
-
-  /* Nonzero means we are inside an IF during a -pcp run.  In this mode
-     macro expansion is done, and preconditions are output for all macro
-     uses requiring them. */
-  char pcp_inside_if;
-
-  /* Nonzero means we have printed (while error reporting) a list of
-     containing files that matches the current status. */
-  char input_stack_listing_current;
-
-  /* If non-zero, macros are not expanded. */
-  char no_macro_expand;
-
-  /* Print column number in error messages. */
-  char show_column;
-
-  /* We're printed a warning recommending against using #import. */
-  char import_warning;
-
-  /* If true, character between '<' and '>' are a single (string) token. */
-  char parsing_include_directive;
-
-  /* True if escape sequences (as described for has_escapes in
-     parse_buffer) should be emitted. */
-  char output_escapes;
-
-  /* 0: Have seen non-white-space on this line.
-     1: Only seen white space so far on this line.
-     2: Only seen white space so far in this file. */
-   char only_seen_white;
-
-  /* Nonzero means this file was included with a -imacros or -include
-     command line and should not be recorded as an include file.  */
-
-  int no_record_file;
-
-  long lineno;
+  unsigned int len;
+  const unsigned char *text;
+};
 
-  struct tm *timebuf;
+/* Flags for the cpp_token structure.  */
+#define PREV_WHITE	(1 << 0) /* If whitespace before this token.  */
+#define DIGRAPH		(1 << 1) /* If it was a digraph.  */
+#define STRINGIFY_ARG	(1 << 2) /* If macro argument to be stringified.  */
+#define PASTE_LEFT	(1 << 3) /* If on LHS of a ## operator.  */
+#define NAMED_OP	(1 << 4) /* C++ named operators.  */
+#define NO_EXPAND	(1 << 5) /* Do not macro-expand this token.  */
+#define BOL		(1 << 6) /* Token at beginning of line.  */
+
+/* A preprocessing token.  This has been carefully packed and should
+   occupy 16 bytes on 32-bit hosts and 24 bytes on 64-bit hosts.  */
+struct cpp_token
+{
+  unsigned int line;		/* Logical line of first char of token.  */
+  unsigned short col;		/* Column of first char of token.  */
+  ENUM_BITFIELD(cpp_ttype) type : CHAR_BIT;  /* token type */
+  unsigned char flags;		/* flags - see above */
+
+  union
+  {
+    cpp_hashnode *node;		/* An identifier.  */
+    const cpp_token *source;	/* Inherit padding from this token.  */
+    struct cpp_string str;	/* A string, or number.  */
+    unsigned int arg_no;	/* Argument no. for a CPP_MACRO_ARG.  */
+    unsigned char c;		/* Character represented by CPP_OTHER.  */
+  } val;
+};
 
-  /* Buffer of -M output.  */
-  char *deps_buffer;
+/* A standalone character.  We may want to make it unsigned for the
+   same reason we use unsigned char - to avoid signedness issues.  */
+typedef int cppchar_t;
 
-  /* Number of bytes allocated in above.  */
-  int deps_allocated_size;
+/* Values for opts.dump_macros.
+  dump_only means inhibit output of the preprocessed text
+             and instead output the definitions of all user-defined
+             macros in a form suitable for use as input to cpp.
+   dump_names means pass #define and the macro name through to output.
+   dump_definitions means pass the whole definition (plus #define) through
+*/
+enum { dump_none = 0, dump_only, dump_names, dump_definitions };
 
-  /* Number of bytes used.  */
-  int deps_size;
+/* This structure is nested inside struct cpp_reader, and
+   carries all the options visible to the command line.  */
+struct cpp_options
+{
+  /* Name of input and output files.  */
+  const char *in_fname;
+  const char *out_fname;
 
-  /* Number of bytes since the last newline.  */
-  int deps_column;
+  /* Characters between tab stops.  */
+  unsigned int tabstop;
 
-  /* A buffer and a table, used only by read_and_prescan (in cppfiles.c)
-     which are allocated once per cpp_reader object to keep them off the
-     stack and avoid setup costs.  */
-  U_CHAR *input_buffer;
-  U_CHAR *input_speccase;
-  size_t input_buffer_len;
-};
+  /* Pending options - -D, -U, -A, -I, -ixxx.  */
+  struct cpp_pending *pending;
 
-#define CPP_FATAL_LIMIT 1000
-/* True if we have seen a "fatal" error. */
-#define CPP_FATAL_ERRORS(READER) ((READER)->errors >= CPP_FATAL_LIMIT)
-
-#define CPP_BUF_PEEK(BUFFER) \
-  ((BUFFER)->cur < (BUFFER)->rlimit ? *(BUFFER)->cur : EOF)
-#define CPP_BUF_GET(BUFFER) \
-  ((BUFFER)->cur < (BUFFER)->rlimit ? *(BUFFER)->cur++ : EOF)
-#define CPP_FORWARD(BUFFER, N) ((BUFFER)->cur += (N))
-
-/* Macros for manipulating the token_buffer. */
-
-#define CPP_OUT_BUFFER(PFILE) ((PFILE)->token_buffer)
-
-/* Number of characters currently in PFILE's output buffer. */
-#define CPP_WRITTEN(PFILE) ((size_t)((PFILE)->limit - (PFILE)->token_buffer))
-#define CPP_PWRITTEN(PFILE) ((PFILE)->limit)
-
-/* Make sure PFILE->token_buffer has space for at least N more characters. */
-#define CPP_RESERVE(PFILE, N) \
-  (CPP_WRITTEN (PFILE) + (size_t)(N) > (PFILE)->token_buffer_size \
-   && (cpp_grow_buffer (PFILE, N), 0))
-
-/* Append string STR (of length N) to PFILE's output buffer.
-   Assume there is enough space. */
-#define CPP_PUTS_Q(PFILE, STR, N) \
-  (memcpy ((PFILE)->limit, STR, (N)), (PFILE)->limit += (N))
-/* Append string STR (of length N) to PFILE's output buffer.  Make space. */
-#define CPP_PUTS(PFILE, STR, N) CPP_RESERVE(PFILE, N), CPP_PUTS_Q(PFILE, STR,N)
-/* Append character CH to PFILE's output buffer.  Assume sufficient space. */
-#define CPP_PUTC_Q(PFILE, CH) (*(PFILE)->limit++ = (CH))
-/* Append character CH to PFILE's output buffer.  Make space if need be. */
-#define CPP_PUTC(PFILE, CH) (CPP_RESERVE (PFILE, 1), CPP_PUTC_Q (PFILE, CH))
-/* Make sure PFILE->limit is followed by '\0'. */
-#define CPP_NUL_TERMINATE_Q(PFILE) (*(PFILE)->limit = 0)
-#define CPP_NUL_TERMINATE(PFILE) (CPP_RESERVE(PFILE, 1), *(PFILE)->limit = 0)
-#define CPP_ADJUST_WRITTEN(PFILE,DELTA) ((PFILE)->limit += (DELTA))
-#define CPP_SET_WRITTEN(PFILE,N) ((PFILE)->limit = (PFILE)->token_buffer + (N))
-
-/* Advance the current line by one. */
-#define CPP_BUMP_BUFFER_LINE(PBUF) ((PBUF)->lineno++,\
-				    (PBUF)->line_base = (PBUF)->cur)
-#define CPP_BUMP_LINE(PFILE) CPP_BUMP_BUFFER_LINE(CPP_BUFFER(PFILE))
-
-#define CPP_OPTIONS(PFILE) ((PFILE)->opts)
-#define CPP_BUFFER(PFILE) ((PFILE)->buffer)
-#define CPP_PREV_BUFFER(BUFFER) ((BUFFER)->prev)
-/* The bottom of the buffer stack. */
-#define CPP_NULL_BUFFER(PFILE) NULL
-
-/* The `pending' structure accumulates all the options that are not
-   actually processed until we hit cpp_start_read.  It consists of
-   several lists, one for each type of option.  We keep both head and
-   tail pointers for quick insertion. */
-struct cpp_pending
-{
-  struct pending_option *define_head, *define_tail;
-  struct pending_option *assert_head, *assert_tail;
+  /* File name which deps are being written to.  This is 0 if deps are
+     being written to stdout.  */
+  const char *deps_file;
 
-  struct file_name_list *quote_head, *quote_tail;
-  struct file_name_list *brack_head, *brack_tail;
-  struct file_name_list *systm_head, *systm_tail;
-  struct file_name_list *after_head, *after_tail;
+  /* Search paths for include files.  */
+  struct search_path *quote_include;	/* "" */
+  struct search_path *bracket_include;  /* <> */
 
-  struct pending_option *imacros_head, *imacros_tail;
-  struct pending_option *include_head, *include_tail;
-};
+  /* Map between header names and file names, used only on DOS where
+     file names are limited in length.  */
+  struct file_name_map_list *map_list;
 
-/* Pointed to by cpp_reader.opts. */
-struct cpp_options {
-  char *in_fname;
+  /* Directory prefix that should replace `/usr/lib/gcc-lib/TARGET/VERSION'
+     in the standard include file directories.  */
+  const char *include_prefix;
+  unsigned int include_prefix_len;
 
-  /* Name of output file, for error messages.  */
-  char *out_fname;
+  /* -fleading_underscore sets this to "_".  */
+  const char *user_label_prefix;
 
-  struct file_name_map_list *map_list;
+  /* The language we're preprocessing.  */
+  enum c_lang lang;
 
   /* Non-0 means -v, so print the full set of include dirs.  */
-  char verbose;
+  unsigned char verbose;
 
   /* Nonzero means use extra default include directories for C++.  */
-
-  char cplusplus;
+  unsigned char cplusplus;
 
   /* Nonzero means handle cplusplus style comments */
-
-  char cplusplus_comments;
+  unsigned char cplusplus_comments;
 
   /* Nonzero means handle #import, for objective C.  */
+  unsigned char objc;
 
-  char objc;
-
-  /* Nonzero means this is an assembly file, and allow
-     unknown directives, which could be comments.  */
+  /* Nonzero means don't copy comments into the output file.  */
+  unsigned char discard_comments;
 
-  int lang_asm;
+  /* Nonzero means process the ISO trigraph sequences.  */
+  unsigned char trigraphs;
 
-  /* Nonzero means turn NOTREACHED into #pragma NOTREACHED etc */
+  /* Nonzero means process the ISO digraph sequences.  */
+  unsigned char digraphs;
 
-  char for_lint;
+  /* Nonzero means to allow hexadecimal floats and LL suffixes.  */
+  unsigned char extended_numbers;
 
-  /* Nonzero means handle CHILL comment syntax
-     and output CHILL string delimiter for __DATE___ etc. */
+  /* Nonzero means print the names of included files rather than the
+     preprocessed output.  1 means just the #include "...", 2 means
+     #include <...> as well.  */
+  unsigned char print_deps;
 
-  char chill;
+  /* Nonzero if phony targets are created for each header.  */
+  unsigned char deps_phony_targets;
 
-  /* Nonzero means copy comments into the output file.  */
+  /* Nonzero if missing .h files in -M output are assumed to be
+     generated files and not errors.  */
+  unsigned char print_deps_missing_files;
 
-  char put_out_comments;
-
-  /* Nonzero means process the ANSI trigraph sequences.  */
-
-  char trigraphs;
-
-  /* Nonzero means print the names of included files rather than
-     the preprocessed output.  1 means just the #include "...",
-     2 means #include <...> as well.  */
-
-  char print_deps;
-
-  /* Nonzero if missing .h files in -M output are assumed to be generated
-     files and not errors.  */
-
-  char print_deps_missing_files;
-
-  /* If true, fopen (deps_file, "a") else fopen (deps_file, "w"). */
-  char print_deps_append;
+  /* If true, fopen (deps_file, "a") else fopen (deps_file, "w").  */
+  unsigned char print_deps_append;
 
   /* Nonzero means print names of header files (-H).  */
+  unsigned char print_include_names;
 
-  char print_include_names;
+  /* Nonzero means cpp_pedwarn causes a hard error.  */
+  unsigned char pedantic_errors;
 
-  /* Nonzero means try to make failure to fit ANSI C an error.  */
+  /* Nonzero means don't print warning messages.  */
+  unsigned char inhibit_warnings;
 
-  char pedantic_errors;
+  /* Nonzero means don't suppress warnings from system headers.  */
+  unsigned char warn_system_headers;
 
-  /* Nonzero means don't print warning messages.  -w.  */
-
-  char inhibit_warnings;
+  /* Nonzero means don't print error messages.  Has no option to
+     select it, but can be set by a user of cpplib (e.g. fix-header).  */
+  unsigned char inhibit_errors;
 
   /* Nonzero means warn if slash-star appears in a comment.  */
-
-  char warn_comments;
+  unsigned char warn_comments;
 
   /* Nonzero means warn if there are any trigraphs.  */
-
-  char warn_trigraphs;
+  unsigned char warn_trigraphs;
 
   /* Nonzero means warn if #import is used.  */
+  unsigned char warn_import;
 
-  char warn_import;
-
-  /* Nonzero means warn if a macro argument is (or would be)
-     stringified with -traditional.  */
-
-  char warn_stringify;
+  /* Nonzero means warn about various incompatibilities with
+     traditional C.  */
+  unsigned char warn_traditional;
 
   /* Nonzero means turn warnings into errors.  */
+  unsigned char warnings_are_errors;
 
-  char warnings_are_errors;
-
-  /* Nonzero causes output not to be done,
-     but directives such as #define that have side effects
-     are still obeyed.  */
-
-  char no_output;
+  /* Nonzero causes output not to be done, but directives such as
+     #define that have side effects are still obeyed.  */
+  unsigned char no_output;
 
   /* Nonzero means we should look for header.gcc files that remap file
      names.  */
-  char remap;
+  unsigned char remap;
 
   /* Nonzero means don't output line number information.  */
+  unsigned char no_line_commands;
 
-  char no_line_commands;
-
-/* Nonzero means output the text in failing conditionals,
-   inside #failed ... #endfailed.  */
-
-  char output_conditionals;
-
-  /* Nonzero means -I- has been seen,
-     so don't look for #include "foo" the source-file directory.  */
-  char ignore_srcdir;
+  /* Nonzero means -I- has been seen, so don't look for #include "foo"
+     the source-file directory.  */
+  unsigned char ignore_srcdir;
 
-  /* Zero means dollar signs are punctuation.
-     This used to be needed for conformance to the C Standard,
-     before the C Standard was corrected.  */
-  char dollars_in_ident;
-
-  /* Nonzero means try to imitate old fashioned non-ANSI preprocessor.  */
-  char traditional;
+  /* Zero means dollar signs are punctuation.  */
+  unsigned char dollars_in_ident;
 
   /* Nonzero means warn if undefined identifiers are evaluated in an #if.  */
-  char warn_undef;
+  unsigned char warn_undef;
 
-  /* Nonzero for the 1989 C Standard, including corrigenda and amendments.  */
-  char c89;
+  /* Nonzero for the 1999 C Standard, including corrigenda and amendments.  */
+  unsigned char c99;
 
-  /* Nonzero for the 199x C Standard, including corrigenda and amendments.  */
-  char c9x;
-  
   /* Nonzero means give all the error messages the ANSI standard requires.  */
-  char pedantic;
+  unsigned char pedantic;
 
-  char done_initializing;
+  /* Nonzero means we're looking at already preprocessed code, so don't
+     bother trying to do macro expansion and whatnot.  */
+  unsigned char preprocessed;
 
-  /* Search paths for include files.  */
-  struct file_name_list *quote_include;	 /* First dir to search for "file" */
-  struct file_name_list *bracket_include;/* First dir to search for <file> */
+  /* Nonzero disables all the standard directories for headers.  */
+  unsigned char no_standard_includes;
 
-  /* Directory prefix that should replace `/usr/lib/gcc-lib/TARGET/VERSION'
-     in the standard include file directories.  */
-  char *include_prefix;
-  int include_prefix_len;
-
-  char no_standard_includes;
-  char no_standard_cplusplus_includes;
-
-/* dump_only means inhibit output of the preprocessed text
-             and instead output the definitions of all user-defined
-             macros in a form suitable for use as input to cccp.
-   dump_names means pass #define and the macro name through to output.
-   dump_definitions means pass the whole definition (plus #define) through
-*/
+  /* Nonzero disables the C++-specific standard directories for headers.  */
+  unsigned char no_standard_cplusplus_includes;
 
-  enum {dump_none = 0, dump_only, dump_names, dump_definitions}
-     dump_macros;
+  /* Nonzero means dump macros in some fashion - see above.  */
+  unsigned char dump_macros;
 
-/* Nonzero means pass all #define and #undef directives which we actually
-   process through to the output stream.  This feature is used primarily
-   to allow cc1 to record the #defines and #undefs for the sake of
-   debuggers which understand about preprocessor macros, but it may
-   also be useful with -E to figure out how symbols are defined, and
-   where they are defined.  */
-  int debug_output;
+  /* Nonzero means pass #include lines through to the output.  */
+  unsigned char dump_includes;
 
-  /* Nonzero means pass #include lines through to the output,
-     even if they are ifdefed out.  */
-  int dump_includes;
+  /* Print column number in error messages.  */
+  unsigned char show_column;
 
-  /* Pending options - -D, -U, -A, -I, -ixxx. */
-  struct cpp_pending *pending;
+  /* Nonzero means handle C++ alternate operator names.  */
+  unsigned char operator_names;
 
-  /* File name which deps are being written to.
-     This is 0 if deps are being written to stdout.  */
-  char *deps_file;
+  /* True if --help, --version or --target-help appeared in the
+     options.  Stand-alone CPP should then bail out after option
+     parsing; drivers might want to continue printing help.  */
+  unsigned char help_only;
+};
 
-  /* Target-name to write with the dependency information.  */
-  char *deps_target;
+/* Call backs.  */
+struct cpp_callbacks
+{
+  /* Called when a new line of preprocessed output is started.  */
+  void (*line_change) PARAMS ((cpp_reader *, const cpp_token *, int));
+  void (*file_change) PARAMS ((cpp_reader *, const struct line_map *));
+  void (*include) PARAMS ((cpp_reader *, unsigned int,
+			   const unsigned char *, const cpp_token *));
+  void (*define) PARAMS ((cpp_reader *, unsigned int, cpp_hashnode *));
+  void (*undef) PARAMS ((cpp_reader *, unsigned int, cpp_hashnode *));
+  void (*ident) PARAMS ((cpp_reader *, unsigned int, const cpp_string *));
+  void (*def_pragma) PARAMS ((cpp_reader *, unsigned int));
 };
 
-#define CPP_TRADITIONAL(PFILE) (CPP_OPTIONS(PFILE)-> traditional)
-#define CPP_WARN_UNDEF(PFILE) (CPP_OPTIONS(PFILE)->warn_undef)
-#define CPP_C89(PFILE) (CPP_OPTIONS(PFILE)->c89)
-#define CPP_PEDANTIC(PFILE) (CPP_OPTIONS (PFILE)->pedantic)
-#define CPP_PRINT_DEPS(PFILE) (CPP_OPTIONS (PFILE)->print_deps)
+#define CPP_FATAL_LIMIT 1000
+/* True if we have seen a "fatal" error.  */
+#define CPP_FATAL_ERRORS(PFILE) (cpp_errors (PFILE) >= CPP_FATAL_LIMIT)
 
-/* List of directories to look for include files in. */
-struct file_name_list
+/* Name under which this program was invoked.  */
+extern const char *progname;
+
+/* The structure of a node in the hash table.  The hash table has
+   entries for all identifiers: either macros defined by #define
+   commands (type NT_MACRO), assertions created with #assert
+   (NT_ASSERTION), or neither of the above (NT_VOID).  Builtin macros
+   like __LINE__ are flagged NODE_BUILTIN.  Poisioned identifiers are
+   flagged NODE_POISONED.  NODE_OPERATOR (C++ only) indicates an
+   identifier that behaves like an operator such as "xor".
+   NODE_DIAGNOSTIC is for speed in lex_token: it indicates a
+   diagnostic may be required for this node.  Currently this only
+   applies to __VA_ARGS__ and poisoned identifiers.  */
+
+/* Hash node flags.  */
+#define NODE_OPERATOR	(1 << 0)	/* C++ named operator.  */
+#define NODE_POISONED	(1 << 1)	/* Poisoned identifier.  */
+#define NODE_BUILTIN	(1 << 2)	/* Builtin macro.  */
+#define NODE_DIAGNOSTIC (1 << 3)	/* Possible diagnostic when lexed.  */
+#define NODE_WARN	(1 << 4)	/* Warn if redefined or undefined.  */
+#define NODE_DISABLED	(1 << 5)	/* A disabled macro.  */
+
+/* Different flavors of hash node.  */
+enum node_type
 {
-  struct file_name_list *next;
-  struct file_name_list *alloc; /* for the cache of
-				   current directory entries */
-  char *name;
-  unsigned int nlen;
-  /* We use these to tell if the directory mentioned here is a duplicate
-     of an earlier directory on the search path. */
-  ino_t ino;
-  dev_t dev;
-  /* If the following is nonzero, it is a C-language system include
-     directory.  */
-  int sysp;
-  /* Mapping of file names for this directory.
-     Only used on MS-DOS and related platforms. */
-  struct file_name_map *name_map;
+  NT_VOID = 0,	   /* No definition yet.  */
+  NT_MACRO,	   /* A macro of some form.  */
+  NT_ASSERTION	   /* Predicate for #assert.  */
 };
-#define ABSOLUTE_PATH ((struct file_name_list *)-1)
 
-/* This structure is used for the table of all includes.  It is
-   indexed by the `short name' (the name as it appeared in the
-   #include statement) which is stored in *nshort.  */
-struct include_hash
+/* Different flavors of builtin macro.  _Pragma is an operator, but we
+   handle it with the builtin code for efficiency reasons.  */
+enum builtin_type
 {
-  struct include_hash *next;
-  /* Next file with the same short name but a
-     different (partial) pathname). */
-  struct include_hash *next_this_file;
-
-  /* Location of the file in the include search path.
-     Used for include_next */
-  struct file_name_list *foundhere;
-  char *name;		/* (partial) pathname of file */
-  char *nshort;		/* name of file as referenced in #include */
-  char *control_macro;	/* macro, if any, preventing reinclusion - see
-			   redundant_include_p */
-  char *buf, *limit;	/* for file content cache, not yet implemented */
+  BT_SPECLINE = 0,		/* `__LINE__' */
+  BT_DATE,			/* `__DATE__' */
+  BT_FILE,			/* `__FILE__' */
+  BT_BASE_FILE,			/* `__BASE_FILE__' */
+  BT_INCLUDE_LEVEL,		/* `__INCLUDE_LEVEL__' */
+  BT_TIME,			/* `__TIME__' */
+  BT_STDC,			/* `__STDC__' */
+  BT_PRAGMA			/* `_Pragma' operator */
 };
 
-/* Name under which this program was invoked.  */
+#define CPP_HASHNODE(HNODE)	((cpp_hashnode *) (HNODE))
+#define HT_NODE(NODE)		((ht_identifier *) (NODE))
+#define NODE_LEN(NODE)		HT_LEN (&(NODE)->ident)
+#define NODE_NAME(NODE)		HT_STR (&(NODE)->ident)
 
-extern char *progname;
-
-/* The structure of a node in the hash table.  The hash table
-   has entries for all tokens defined by #define commands (type T_MACRO),
-   plus some special tokens like __LINE__ (these each have their own
-   type, and the appropriate code is run when that type of node is seen.
-   It does not contain control words like "#define", which are recognized
-   by a separate piece of code. */
-
-/* different flavors of hash nodes --- also used in keyword table */
-enum node_type {
- T_DEFINE = 1,	/* the `#define' keyword */
- T_INCLUDE,	/* the `#include' keyword */
- T_INCLUDE_NEXT, /* the `#include_next' keyword */
- T_IMPORT,      /* the `#import' keyword */
- T_IFDEF,	/* the `#ifdef' keyword */
- T_IFNDEF,	/* the `#ifndef' keyword */
- T_IF,		/* the `#if' keyword */
- T_ELSE,	/* `#else' */
- T_PRAGMA,	/* `#pragma' */
- T_ELIF,	/* `#elif' */
- T_UNDEF,	/* `#undef' */
- T_LINE,	/* `#line' */
- T_ERROR,	/* `#error' */
- T_WARNING,	/* `#warning' */
- T_ENDIF,	/* `#endif' */
- T_SCCS,	/* `#sccs', used on system V.  */
- T_IDENT,	/* `#ident', used on system V.  */
- T_ASSERT,	/* `#assert', taken from system V.  */
- T_UNASSERT,	/* `#unassert', taken from system V.  */
- T_SPECLINE,	/* special symbol `__LINE__' */
- T_DATE,	/* `__DATE__' */
- T_FILE,	/* `__FILE__' */
- T_BASE_FILE,	/* `__BASE_FILE__' */
- T_INCLUDE_LEVEL, /* `__INCLUDE_LEVEL__' */
- T_VERSION,	/* `__VERSION__' */
- T_TIME,	/* `__TIME__' */
- T_STDC,	/* `__STDC__' */
- T_CONST,	/* Constant string, used by `__SIZE_TYPE__' etc */
- T_MACRO,	/* macro defined by `#define' */
- T_DISABLED,	/* macro temporarily turned off for rescan */
- T_PCSTRING,	/* precompiled string (hashval is KEYDEF *) */
- T_UNUSED	/* Used for something not defined.  */
- };
-
-/* Structure returned by create_definition */
-typedef struct macrodef MACRODEF;
-struct macrodef
+/* The common part of an identifier node shared amongst all 3 C front
+   ends.  Also used to store CPP identifiers, which are a superset of
+   identifiers in the grammatical sense.  */
+struct cpp_hashnode
 {
-  struct definition *defn;
-  unsigned char *symnam;
-  int symlen;
+  struct ht_identifier ident;
+  unsigned short arg_index;		/* Macro argument index.  */
+  unsigned char directive_index;	/* Index into directive table.  */
+  unsigned char rid_code;		/* Rid code - for front ends.  */
+  ENUM_BITFIELD(node_type) type : 8;	/* CPP node type.  */
+  unsigned char flags;			/* CPP flags.  */
+
+  union
+  {
+    cpp_macro *macro;			/* If a macro.  */
+    struct answer *answers;		/* Answers to an assertion.  */
+    enum cpp_ttype operator;		/* Code for a named operator.  */
+    enum builtin_type builtin;		/* Code for a builtin macro.  */
+  } value;
 };
 
-/* Structure allocated for every #define.  For a simple replacement
-   such as
-   	#define foo bar ,
-   nargs = -1, the `pattern' list is null, and the expansion is just
-   the replacement text.  Nargs = 0 means a functionlike macro with no args,
-   e.g.,
-       #define getchar() getc (stdin) .
-   When there are args, the expansion is the replacement text with the
-   args squashed out, and the reflist is a list describing how to
-   build the output from the input: e.g., "3 chars, then the 1st arg,
-   then 9 chars, then the 3rd arg, then 0 chars, then the 2nd arg".
-   The chars here come from the expansion.  Whatever is left of the
-   expansion after the last arg-occurrence is copied after that arg.
-   Note that the reflist can be arbitrarily long---
-   its length depends on the number of times the arguments appear in
-   the replacement text, not how many args there are.  Example:
-   #define f(x) x+x+x+x+x+x+x would have replacement text "++++++" and
-   pattern list
-     { (0, 1), (1, 1), (1, 1), ..., (1, 1), NULL }
-   where (x, y) means (nchars, argno). */
-
-typedef struct definition DEFINITION;
-struct definition {
-  int nargs;
-  int length;			/* length of expansion string */
-  int predefined;		/* True if the macro was builtin or */
-				/* came from the command line */
-  unsigned char *expansion;
-  int line;			/* Line number of definition */
-  char *file;			/* File of definition */
-  char rest_args;		/* Nonzero if last arg. absorbs the rest */
-  struct reflist {
-    struct reflist *next;
-    char stringify;		/* nonzero if this arg was preceded by a
-				   # operator. */
-    char raw_before;		/* Nonzero if a ## operator before arg. */
-    char raw_after;		/* Nonzero if a ## operator after arg. */
-    char rest_args;		/* Nonzero if this arg. absorbs the rest */
-    int nchars;			/* Number of literal chars to copy before
-				   this arg occurrence.  */
-    int argno;			/* Number of arg to substitute (origin-0) */
-  } *pattern;
-  union {
-    /* Names of macro args, concatenated in reverse order
-       with comma-space between them.
-       The only use of this is that we warn on redefinition
-       if this differs between the old and new definitions.  */
-    unsigned char *argnames;
-  } args;
-};
+/* Call this first to get a handle to pass to other functions.  */
+extern cpp_reader *cpp_create_reader PARAMS ((enum c_lang));
+
+/* Call these to get pointers to the options and callback structures
+   for a given reader.  These pointers are good until you call
+   cpp_finish on that reader.  You can either edit the callbacks
+   through the pointer returned from cpp_get_callbacks, or set them
+   with cpp_set_callbacks.  */
+extern cpp_options *cpp_get_options PARAMS ((cpp_reader *));
+extern const struct line_maps *cpp_get_line_maps PARAMS ((cpp_reader *));
+extern cpp_callbacks *cpp_get_callbacks PARAMS ((cpp_reader *));
+extern void cpp_set_callbacks PARAMS ((cpp_reader *, cpp_callbacks *));
+
+/* Now call cpp_handle_option[s] to handle 1[or more] switches.  The
+   return value is the number of arguments used.  If
+   cpp_handle_options returns without using all arguments, it couldn't
+   understand the next switch.  When there are no switches left, you
+   must call cpp_post_options before calling cpp_read_main_file.  Only
+   after cpp_post_options are the contents of the cpp_options
+   structure reliable.  Options processing is not completed until you
+   call cpp_finish_options.  */
+extern int cpp_handle_options PARAMS ((cpp_reader *, int, char **));
+extern int cpp_handle_option PARAMS ((cpp_reader *, int, char **, int));
+extern void cpp_post_options PARAMS ((cpp_reader *));
+
+/* This function reads the file, but does not start preprocessing.  It
+   returns the name of the original file; this is the same as the
+   input file, except for preprocessed input.  This will generate at
+   least one file change callback, and possibly a line change callback
+   too.  If there was an error opening the file, it returns NULL.
+
+   If you want cpplib to manage its own hashtable, pass in a NULL
+   pointer.  Otherise you should pass in an initialised hash table
+   that cpplib will share; this technique is used by the C front
+   ends.  */
+extern const char *cpp_read_main_file PARAMS ((cpp_reader *, const char *,
+					       struct ht *));
+
+/* Deferred handling of command line options that can generate debug
+   callbacks, such as -D and -imacros.  Call this after
+   cpp_read_main_file.  The front ends need this separation so they
+   can initialize debug output with the original file name, returned
+   from cpp_read_main_file, before they get debug callbacks.  */
+extern void cpp_finish_options PARAMS ((cpp_reader *));
+
+/* Call this to release the handle at the end of preprocessing.  Any
+   use of the handle after this function returns is invalid.  Returns
+   cpp_errors (pfile).  */
+extern int cpp_destroy PARAMS ((cpp_reader *));
+
+/* Error count.  */
+extern unsigned int cpp_errors PARAMS ((cpp_reader *));
+
+extern unsigned int cpp_token_len PARAMS ((const cpp_token *));
+extern unsigned char *cpp_token_as_text PARAMS ((cpp_reader *,
+						 const cpp_token *));
+extern unsigned char *cpp_spell_token PARAMS ((cpp_reader *, const cpp_token *,
+					       unsigned char *));
+extern void cpp_register_pragma PARAMS ((cpp_reader *,
+					 const char *, const char *,
+					 void (*) PARAMS ((cpp_reader *))));
 
-/* These tables are not really `const', but they are only modified at
-   initialization time, in a separate translation unit from the rest
-   of the library.  We let the rest of the library think they are `const'
-   to get better code and some additional sanity checks.  */
-#ifndef FAKE_CONST
-#define FAKE_CONST const
-#endif
-extern FAKE_CONST unsigned char is_idstart[256];
-extern FAKE_CONST unsigned char is_idchar[256];
-extern FAKE_CONST unsigned char is_hor_space[256];
-extern FAKE_CONST unsigned char is_space[256];
-extern FAKE_CONST unsigned char trigraph_table[256];
-#undef FAKE_CONST
-
-/* Stack of conditionals currently in progress
-   (including both successful and failing conditionals).  */
-
-struct if_stack {
-  struct if_stack *next;	/* for chaining to the next stack frame */
-  char *fname;		/* copied from input when frame is made */
-  int lineno;			/* similarly */
-  int if_succeeded;		/* true if a leg of this if-group
-				    has been passed through rescan */
-  unsigned char *control_macro;	/* For #ifndef at start of file,
-				   this is the macro name tested.  */
-  enum node_type type;		/* type of last directive seen in this group */
-};
-typedef struct if_stack IF_STACK_FRAME;
+extern void cpp_finish PARAMS ((cpp_reader *));
+extern int cpp_avoid_paste PARAMS ((cpp_reader *, const cpp_token *,
+				    const cpp_token *));
+extern const cpp_token *cpp_get_token PARAMS ((cpp_reader *));
+extern const unsigned char *cpp_macro_definition PARAMS ((cpp_reader *,
+						  const cpp_hashnode *));
+extern void _cpp_backup_tokens PARAMS ((cpp_reader *, unsigned int));
+
+/* Evaluate a CPP_CHAR or CPP_WCHAR token.  */
+extern HOST_WIDE_INT
+cpp_interpret_charconst PARAMS ((cpp_reader *, const cpp_token *,
+				 int, int, unsigned int *));
+
+extern void cpp_define PARAMS ((cpp_reader *, const char *));
+extern void cpp_assert PARAMS ((cpp_reader *, const char *));
+extern void cpp_undef  PARAMS ((cpp_reader *, const char *));
+extern void cpp_unassert PARAMS ((cpp_reader *, const char *));
+
+extern cpp_buffer *cpp_push_buffer PARAMS ((cpp_reader *,
+					    const unsigned char *, size_t,
+					    int, int));
+extern int cpp_defined PARAMS ((cpp_reader *, const unsigned char *, int));
 
-extern void cpp_buf_line_and_col PARAMS((cpp_buffer *, long *, long *));
-extern cpp_buffer* cpp_file_buffer PARAMS((cpp_reader *));
-extern void cpp_define PARAMS ((cpp_reader *, unsigned char *));
-extern void cpp_assert PARAMS ((cpp_reader *, unsigned char *));
-extern void cpp_undef  PARAMS ((cpp_reader *, unsigned char *));
-extern void cpp_unassert PARAMS ((cpp_reader *, unsigned char *));
+/* N.B. The error-message-printer prototypes have not been nicely
+   formatted because exgettext needs to see 'msgid' on the same line
+   as the name of the function in order to work properly.  Only the
+   string argument gets a name in an effort to keep the lines from
+   getting ridiculously oversized.  */
 
-extern void cpp_error PVPROTO ((cpp_reader *, const char *, ...))
+extern void cpp_ice PARAMS ((cpp_reader *, const char *msgid, ...))
   ATTRIBUTE_PRINTF_2;
-extern void cpp_warning PVPROTO ((cpp_reader *, const char *, ...))
+extern void cpp_fatal PARAMS ((cpp_reader *, const char *msgid, ...))
   ATTRIBUTE_PRINTF_2;
-extern void cpp_pedwarn PVPROTO ((cpp_reader *, const char *, ...))
+extern void cpp_error PARAMS ((cpp_reader *, const char *msgid, ...))
   ATTRIBUTE_PRINTF_2;
-extern void cpp_error_with_line PVPROTO ((cpp_reader *, int, int, const char *, ...))
-  ATTRIBUTE_PRINTF_4;
-extern void cpp_warning_with_line PVPROTO ((cpp_reader *, int, int, const char *, ...))
+extern void cpp_warning PARAMS ((cpp_reader *, const char *msgid, ...))
+  ATTRIBUTE_PRINTF_2;
+extern void cpp_pedwarn PARAMS ((cpp_reader *, const char *msgid, ...))
+  ATTRIBUTE_PRINTF_2;
+extern void cpp_notice PARAMS ((cpp_reader *, const char *msgid, ...))
+  ATTRIBUTE_PRINTF_2;
+extern void cpp_error_with_line PARAMS ((cpp_reader *, int, int, const char *msgid, ...))
   ATTRIBUTE_PRINTF_4;
-extern void cpp_pedwarn_with_line PVPROTO ((cpp_reader *, int, int, const char *, ...))
+extern void cpp_warning_with_line PARAMS ((cpp_reader *, int, int, const char *msgid, ...))
   ATTRIBUTE_PRINTF_4;
-extern void cpp_pedwarn_with_file_and_line PVPROTO ((cpp_reader *, char *, int, const char *, ...))
+extern void cpp_pedwarn_with_line PARAMS ((cpp_reader *, int, int, const char *msgid, ...))
   ATTRIBUTE_PRINTF_4;
-extern void cpp_message_from_errno PROTO ((cpp_reader *, int, const char *));
-extern void cpp_error_from_errno PROTO ((cpp_reader *, const char *));
-extern void cpp_perror_with_name PROTO ((cpp_reader *, const char *));
-extern void v_cpp_message PROTO ((cpp_reader *, int, const char *, va_list));
-
-extern void cpp_grow_buffer PARAMS ((cpp_reader *, long));
-extern HOST_WIDEST_INT cpp_parse_escape PARAMS ((cpp_reader *, char **, HOST_WIDEST_INT));
-extern cpp_buffer *cpp_push_buffer PARAMS ((cpp_reader *,
-					    unsigned char *, long));
-extern cpp_buffer *cpp_pop_buffer PARAMS ((cpp_reader *));
-
-extern cpp_hashnode *cpp_lookup PARAMS ((cpp_reader *, const unsigned char *,
-					 int, int));
-extern void cpp_reader_init PARAMS ((cpp_reader *));
-extern void cpp_options_init PARAMS ((cpp_options *));
-extern int cpp_start_read PARAMS ((cpp_reader *, char *));
-extern int cpp_read_check_assertion PARAMS ((cpp_reader *));
-extern int scan_decls PARAMS ((cpp_reader *, int, char **));
-extern void skip_rest_of_line PARAMS ((cpp_reader *));
-extern void cpp_finish PARAMS ((cpp_reader *));
-
-extern void quote_string		PARAMS ((cpp_reader *, const char *));
-extern void cpp_expand_to_buffer	PARAMS ((cpp_reader *, U_CHAR *, int));
-extern void cpp_scan_buffer		PARAMS ((cpp_reader *));
-extern int check_macro_name		PARAMS ((cpp_reader *, U_CHAR *, int));
-
-/* Last arg to output_line_command.  */
-enum file_change_code {same_file, enter_file, leave_file};
-extern void output_line_command		PARAMS ((cpp_reader *,
-						 enum file_change_code));
-
-/* From cpperror.c */
-extern void cpp_fatal PVPROTO ((cpp_reader *, const char *, ...))
-  ATTRIBUTE_PRINTF_2;
-extern void cpp_message PVPROTO ((cpp_reader *, int, const char *, ...))
-  ATTRIBUTE_PRINTF_3;
-extern void cpp_pfatal_with_name PROTO ((cpp_reader *, const char *));
-extern void cpp_file_line_for_message PROTO ((cpp_reader *, char *, int, int));
-extern void cpp_print_containing_files PROTO ((cpp_reader *));
-extern void cpp_notice PVPROTO ((const char *msgid, ...)) ATTRIBUTE_PRINTF_1;
+extern void cpp_error_from_errno PARAMS ((cpp_reader *, const char *));
+extern void cpp_notice_from_errno PARAMS ((cpp_reader *, const char *));
+
+/* In cpplex.c */
+extern int cpp_ideq			PARAMS ((const cpp_token *,
+						 const char *));
+extern void cpp_output_line		PARAMS ((cpp_reader *, FILE *));
+extern void cpp_output_token		PARAMS ((const cpp_token *, FILE *));
+extern const char *cpp_type2name	PARAMS ((enum cpp_ttype));
+extern unsigned int cpp_parse_escape	PARAMS ((cpp_reader *,
+						 const unsigned char **,
+						 const unsigned char *,
+						 unsigned HOST_WIDE_INT, int));
+
+/* In cpphash.c */
+
+/* Lookup an identifier in the hashtable.  Puts the identifier in the
+   table if it is not already there.  */
+extern cpp_hashnode *cpp_lookup		PARAMS ((cpp_reader *,
+						 const unsigned char *,
+						 unsigned int));
+
+typedef int (*cpp_cb) PARAMS ((cpp_reader *, cpp_hashnode *, void *));
+extern void cpp_forall_identifiers	PARAMS ((cpp_reader *,
+						 cpp_cb, void *));
+
+/* In cppmacro.c */
+extern void cpp_scan_nooutput		PARAMS ((cpp_reader *));
+extern int  cpp_sys_macro_p		PARAMS ((cpp_reader *));
 
 /* In cppfiles.c */
-extern void simplify_pathname		PROTO ((char *));
-extern void merge_include_chains	PROTO ((struct cpp_options *));
-extern int find_include_file		PROTO ((cpp_reader *, char *,
-						struct file_name_list *,
-						struct include_hash **,
-						int *));
-extern int finclude			PROTO ((cpp_reader *, int,
-					        struct include_hash *));
-extern void deps_output			PROTO ((cpp_reader *, char *, int));
-extern struct include_hash *include_hash PROTO ((cpp_reader *, char *, int));
-
-#ifndef INCLUDE_LEN_FUDGE
-#define INCLUDE_LEN_FUDGE 0
-#endif
+extern int cpp_included	PARAMS ((cpp_reader *, const char *));
+extern void cpp_make_system_header PARAMS ((cpp_reader *, int, int));
 
-    
 #ifdef __cplusplus
 }
 #endif
-#endif /* __GCC_CPPLIB__ */
 
+#endif /* ! GCC_CPPLIB_H */