X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Finput.h;h=c360a1d5312c8c8294dd754064e0dcd6fba785ec;hb=26991c0d206a7ca1c6559d7217773ba51ea62805;hp=f15ce6688bf5f6ab4d90d65220ad8811947b9f10;hpb=a59d74d6d29d5e999fe3c5ecda89593a88bbcd79;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/gcc/input.h b/gcc/input.h
index f15ce6688bf..c360a1d5312 100644
--- a/gcc/input.h
+++ b/gcc/input.h
@@ -1,12 +1,13 @@
 /* Declarations for variables relating to reading the source file.
    Used by parsers, lexical analyzers, and error message routines.
-   Copyright (C) 1993, 1997, 1998, 2000, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1997, 1998, 2000, 2003, 2004, 2007
+   Free Software Foundation, Inc.
 
 This file is part of GCC.
 
 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
+Software Foundation; either version 3, or (at your option) any later
 version.
 
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY
@@ -15,19 +16,21 @@ 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 GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */
 
 #ifndef GCC_INPUT_H
 #define GCC_INPUT_H
 
 #include "line-map.h"
-extern struct line_maps line_table;
+extern GTY(()) struct line_maps *line_table;
 
 /* The location for declarations in "<built-in>" */
 #define BUILTINS_LOCATION ((source_location) 2)
 
+/* Note: if any of the types defined inside this #ifdef are changed,
+   gengtype.c:define_location_structures must be updated to match.  */
+
 #ifdef USE_MAPPED_LOCATION
 
 typedef struct
@@ -47,6 +50,8 @@ extern expanded_location expand_location (source_location);
 typedef source_location location_t; /* deprecated typedef */
 typedef source_location source_locus; /* to be removed */
 
+#define location_from_locus(LOCUS) (LOCUS)
+
 #else /* ! USE_MAPPED_LOCATION */
 
 struct location_s GTY(())
@@ -66,6 +71,8 @@ typedef location_t *source_locus;
 extern location_t unknown_location;
 #define UNKNOWN_LOCATION unknown_location
 
+#define location_from_locus(LOCUS) (* (LOCUS))
+
 #endif /* ! USE_MAPPED_LOCATION */
 
 struct file_stack
@@ -84,6 +91,7 @@ extern void push_srcloc (location_t);
 extern void push_srcloc (const char *name, int line);
 #endif /* ! USE_MAPPED_LOCATION */
 extern void pop_srcloc (void);
+extern void restore_input_file_stack (int);
 
 #define LOCATION_FILE(LOC) ((expand_location (LOC)).file)
 #define LOCATION_LINE(LOC) ((expand_location (LOC)).line)
@@ -98,4 +106,7 @@ extern struct file_stack *input_file_stack;
 /* Incremented on each change to input_file_stack.  */
 extern int input_file_stack_tick;
 
+/* The number of bits available for input_file_stack_tick.  */
+#define INPUT_FILE_STACK_BITS	31
+
 #endif