summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbothner <bothner@138bc75d-0d04-0410-961f-82ee72b054a4>2004-06-30 18:35:18 +0000
committerbothner <bothner@138bc75d-0d04-0410-961f-82ee72b054a4>2004-06-30 18:35:18 +0000
commited00008605ef3d1404afde3f15c51c96999d40fc (patch)
tree652b18cc399ac49f094b362582d84bfd85cfe9b9
parent357f7efa28215866eb65169d37697276dd63f8bb (diff)
downloadgcc-ed00008605ef3d1404afde3f15c51c96999d40fc.tar.gz
* include/line-map.h (fileline): Remove old typedef.
* internal.h (struct cpp_reader): Use source_location typedef instead. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@83924 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--libcpp/ChangeLog5
-rw-r--r--libcpp/include/line-map.h1
-rw-r--r--libcpp/internal.h4
3 files changed, 7 insertions, 3 deletions
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index 64f88ad854b..01cb5653f92 100644
--- 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 839467734ef..5b4ac1ec743 100644
--- 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 fd3facf6136..845f1ebdf08 100644
--- 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. */