line-map.h (fileline): Remove old typedef.

	* include/line-map.h (fileline):  Remove old typedef.
	* internal.h (struct cpp_reader):  Use source_location typedef instead.

From-SVN: r83924

diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index 64f88ad854b75c3b2fe2e8cd4f49355d71e5a5e2..01cb5653f92b87226cdf1b11b19ba1ce64e22f85 100644 (file)
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-30  Per Bothner  <per@bothner.com>
+
+       * include/line-map.h (fileline):  Remove old typedef.
+       * internal.h (struct cpp_reader):  Use source_location typedef instead.
+
 2004-06-26  Zack Weinberg  <zack@codesourcery.com>
 
        Partially revert patch of 2004-06-05.

diff --git a/libcpp/include/line-map.h b/libcpp/include/line-map.h
index 839467734efe664f2da8477226c73af8bcce2492..5b4ac1ec743e560664495296e29fe5d61be8de82 100644 (file)
--- a/libcpp/include/line-map.h
+++ b/libcpp/include/line-map.h
@@ -34,7 +34,6 @@ enum lc_reason {LC_ENTER = 0, LC_LEAVE, LC_RENAME};
 /* Long-term, we want to use this to replace struct location_s (in input.h),
    and effectively typedef source_location location_t.  */
 typedef unsigned int source_location;
-typedef source_location fileline; /* deprecated name */
 
 /* Physical source file TO_FILE at line TO_LINE at column 0 is represented
    by the logical START_LOCATION.  TO_LINE+L at column C is represented by

diff --git a/libcpp/internal.h b/libcpp/internal.h
index fd3facf6136d38b3a75406d56bab5e133c36ac4f..845f1ebdf0842ce09746c3a2b6ee9e2792afed2c 100644 (file)
--- a/libcpp/internal.h
+++ b/libcpp/internal.h
@@ -308,7 +308,7 @@ struct cpp_reader
   struct line_maps *line_table;
 
   /* The line of the '#' of the current directive.  */
-  fileline directive_line;
+  source_location directive_line;
 
   /* Memory buffers.  */
   _cpp_buff *a_buff;           /* Aligned permanent storage.  */
@@ -421,7 +421,7 @@ struct cpp_reader
     uchar *base;
     uchar *limit;
     uchar *cur;
-    fileline first_line;
+    source_location first_line;
   } out;
 
   /* Used for buffer overlays by cpptrad.c.  */