PR java/12915:

[pf3gnuchains/gcc-fork.git] / gcc / java / lex.h

diff --git a/gcc/java/lex.h b/gcc/java/lex.h
index e79d7ee..037d044 100644 (file)
--- a/gcc/java/lex.h
+++ b/gcc/java/lex.h
@@ -1,21 +1,22 @@
 /* Language lexer definitions for the GNU compiler for the Java(TM) language.
-   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003
+   Free Software Foundation, Inc.
    Contributed by Alexandre Petit-Bianco (apbianco@cygnus.com)
 
-This file is part of GNU CC.
+This file is part of GCC.
 
-GNU CC is free software; you can redistribute it and/or modify
+GCC is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
-GNU CC is distributed in the hope that it will be useful,
+GCC is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to
+along with GCC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.
 
@@ -26,9 +27,10 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #ifndef GCC_JAVA_LEX_H
 #define GCC_JAVA_LEX_H
 
+#include "input.h"
+
 /* Extern global variables declarations  */
 extern FILE *finput;
-extern int   lineno;
 
 /* A Unicode character, as read from the input file  */
 typedef unsigned short unicode_t;
@@ -95,13 +97,13 @@ struct java_error {
   int error;
 };
 
-typedef struct _java_lc {
+typedef struct java_lc_s GTY(()) {
   int line;
   int prev_col;
   int col;
 } java_lc;
 
-typedef struct java_lexer
+struct java_lexer
 {
   /* The file from which we're reading.  */
   FILE *finput;
@@ -154,10 +156,11 @@ typedef struct java_lexer
   int out_last;
 
 #endif /* HAVE_ICONV */
-} java_lexer;
+};
+typedef struct java_lexer java_lexer;
 
 /* Destroy a lexer object.  */
-extern void java_destroy_lexer PARAMS ((java_lexer *));
+extern void java_destroy_lexer (java_lexer *);
 
 #define JAVA_LINE_MAX 80