cppalloc.c: Update copyright.

	* cppalloc.c: Update copyright.
	* cpplib.c: Merge all the static function prototypes into one
	block.
	* cpplib.h: Remove #if 0 block.

From-SVN: r31818

4 files changed, 47 insertions, 50 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5d4967e..a4e9b70 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 2000-02-05  Zack Weinberg  <zack@wolery.cumb.org>
 
+	* cppalloc.c: Update copyright.
+	* cpplib.c: Merge all the static function prototypes into one
+	block.
+	* cpplib.h: Remove #if 0 block.
+
 	* cpperror.c: Remove #ifdef EMACS block.
 	* cppmain.c: Likewise.
 	* cpphash.c: Remove #if 0 blocks.
diff --git a/gcc/cppalloc.c b/gcc/cppalloc.c
index 3e44dc3..ed39277 100644
--- a/gcc/cppalloc.c
+++ b/gcc/cppalloc.c
@@ -1,5 +1,6 @@
 /* Part of CPP library.  (memory allocation - xmalloc etc)
-   Copyright (C) 1986, 87, 89, 92-95, 98, 99, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1986, 87, 89, 92-95, 98, 99, 2000
+   Free Software Foundation, Inc.
    Written by Per Bothner, 1994.
    Based on CCCP program by Paul Rubin, June 1986
    Adapted to ANSI C, Richard Stallman, Jan 1987
diff --git a/gcc/cpplib.c b/gcc/cpplib.c
index 6c9d14b..409eb08 100644
--- a/gcc/cpplib.c
+++ b/gcc/cpplib.c
@@ -35,22 +35,6 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    (Note that it is false while we're expanding macro *arguments*.) */
 #define CPP_IS_MACRO_BUFFER(PBUF) ((PBUF)->data != NULL)
 
-/* Forward declarations.  */
-
-static const char *my_strerror		PARAMS ((int));
-static void validate_else		PARAMS ((cpp_reader *, const char *));
-static HOST_WIDEST_INT eval_if_expression	PARAMS ((cpp_reader *));
-
-static void conditional_skip		PARAMS ((cpp_reader *, int,
-						enum node_type, U_CHAR *));
-static void skip_if_group		PARAMS ((cpp_reader *));
-
-static void parse_name			PARAMS ((cpp_reader *, int));
-static void parse_string		PARAMS ((cpp_reader *, int));
-static int parse_assertion		PARAMS ((cpp_reader *));
-static const char *if_directive_name	PARAMS ((cpp_reader *,
-						 struct if_stack *));
-
 /* External declarations.  */
 
 extern HOST_WIDEST_INT cpp_parse_expr PARAMS ((cpp_reader *));
@@ -87,26 +71,45 @@ static int do_sccs PARAMS ((cpp_reader *, const struct directive *));
 static int do_assert PARAMS ((cpp_reader *, const struct directive *));
 static int do_unassert PARAMS ((cpp_reader *, const struct directive *));
 static int do_warning PARAMS ((cpp_reader *, const struct directive *));
-static enum cpp_token null_underflow PARAMS ((cpp_reader *));
-static int null_cleanup PARAMS ((cpp_buffer *, cpp_reader *));
-static int skip_comment PARAMS ((cpp_reader *, int));
-static int copy_comment PARAMS ((cpp_reader *, int));
-static void copy_rest_of_line PARAMS ((cpp_reader *));
-static int handle_directive PARAMS ((cpp_reader *));
-static void pass_thru_directive PARAMS ((const U_CHAR *, size_t, cpp_reader *,
-					 const struct directive *));
+
+/* Forward declarations.  */
+
+static const char *my_strerror		PARAMS ((int));
+static void validate_else		PARAMS ((cpp_reader *, const char *));
+static HOST_WIDEST_INT eval_if_expression PARAMS ((cpp_reader *));
+static void conditional_skip		PARAMS ((cpp_reader *, int,
+						enum node_type, U_CHAR *));
+static void skip_if_group		PARAMS ((cpp_reader *));
+static void parse_name			PARAMS ((cpp_reader *, int));
+static void parse_string		PARAMS ((cpp_reader *, int));
+static int parse_assertion		PARAMS ((cpp_reader *));
+static const char *if_directive_name	PARAMS ((cpp_reader *,
+						 struct if_stack *));
+static enum cpp_token null_underflow	PARAMS ((cpp_reader *));
+static int null_cleanup			PARAMS ((cpp_buffer *, cpp_reader *));
+static int skip_comment			PARAMS ((cpp_reader *, int));
+static int copy_comment			PARAMS ((cpp_reader *, int));
+static void copy_rest_of_line		PARAMS ((cpp_reader *));
+static int handle_directive		PARAMS ((cpp_reader *));
+static void pass_thru_directive		PARAMS ((const U_CHAR *, size_t,
+						 cpp_reader *,
+						 const struct directive *));
 static enum cpp_token get_directive_token PARAMS ((cpp_reader *));
-static int read_line_number PARAMS ((cpp_reader *, int *));
-static void cpp_print_file_and_line PARAMS ((cpp_reader *));
-static void v_cpp_error PARAMS ((cpp_reader *, const char *, va_list));
-static void v_cpp_warning PARAMS ((cpp_reader *, const char *, va_list));
-static void v_cpp_error_with_line PARAMS ((cpp_reader *, int, int,
-					   const char *, va_list));
-static void v_cpp_warning_with_line PARAMS ((cpp_reader *, int, int, const char *, va_list));
-static U_CHAR *detect_if_not_defined PARAMS ((cpp_reader *));
-static int consider_directive_while_skipping PARAMS ((cpp_reader *, IF_STACK_FRAME *));
-static void skip_block_comment PARAMS ((cpp_reader *));
-static void skip_line_comment PARAMS ((cpp_reader *));
+static int read_line_number		PARAMS ((cpp_reader *, int *));
+static void cpp_print_file_and_line	PARAMS ((cpp_reader *));
+static void v_cpp_error			PARAMS ((cpp_reader *, const char *,
+						 va_list));
+static void v_cpp_warning		PARAMS ((cpp_reader *, const char *,
+						 va_list));
+static void v_cpp_error_with_line	PARAMS ((cpp_reader *, int, int,
+						 const char *, va_list));
+static void v_cpp_warning_with_line	PARAMS ((cpp_reader *, int, int,
+						 const char *, va_list));
+static U_CHAR *detect_if_not_defined	PARAMS ((cpp_reader *));
+static int consider_directive_while_skipping PARAMS ((cpp_reader *,
+						      IF_STACK_FRAME *));
+static void skip_block_comment		PARAMS ((cpp_reader *));
+static void skip_line_comment		PARAMS ((cpp_reader *));
 
 /* Here is the actual list of #-directives.
    This table is ordered by frequency of occurrence; the numbers
@@ -2329,6 +2332,7 @@ cpp_get_token (pfile)
 	      CPP_PUTC (pfile, c);
 	      return CPP_HSPACE;
 	    }
+
 	case '#':
 	  if (!pfile->only_seen_white)
 	    goto randomchar;
diff --git a/gcc/cpplib.h b/gcc/cpplib.h
index 1207f84..0ddc319 100644
--- a/gcc/cpplib.h
+++ b/gcc/cpplib.h
@@ -53,20 +53,7 @@ enum cpp_token {
   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
+  CPP_POP	/* We're about to pop the buffer stack.  */
 };
 
 typedef enum cpp_token (*parse_underflow_t) PARAMS((cpp_reader *));