PR c++/27292

[pf3gnuchains/gcc-fork.git] / gcc / input.h

diff --git a/gcc/input.h b/gcc/input.h
index f34c74e..0ca3ccf 100644 (file)
--- a/gcc/input.h
+++ b/gcc/input.h
@@ -16,8 +16,8 @@ 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.  */
+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.  */
 
 #ifndef GCC_INPUT_H
 #define GCC_INPUT_H
@@ -28,7 +28,9 @@ extern struct line_maps line_table;
 /* The location for declarations in "<built-in>" */
 #define BUILTINS_LOCATION ((source_location) 2)
 
-typedef struct location_s GTY(())
+#ifdef USE_MAPPED_LOCATION
+
+typedef struct
 {
   /* The name of the source file involved.  */
   const char *file;
@@ -36,11 +38,9 @@ typedef struct location_s GTY(())
   /* The line-location in the source file.  */
   int line;
 
-  /* FUTURE (but confuses gentype): int column. */
+  int column;
 } expanded_location;
 
-#ifdef USE_MAPPED_LOCATION
-
 extern expanded_location expand_location (source_location);
 
 #define UNKNOWN_LOCATION ((source_location) 0)
@@ -49,6 +49,16 @@ typedef source_location source_locus; /* to be removed */
 
 #else /* ! USE_MAPPED_LOCATION */
 
+struct location_s GTY(())
+{
+  /* The name of the source file involved.  */
+  const char *file;
+
+  /* The line-location in the source file.  */
+  int line;
+};
+
+typedef struct location_s expanded_location;
 typedef struct location_s location_t;
 typedef location_t *source_locus;