From c219ee5c4c1c65df286c6dd6eca52d10ad1dec5a Mon Sep 17 00:00:00 2001 From: dodji Date: Fri, 15 Jul 2011 21:34:02 +0000 Subject: [PATCH] Use source_location where it is due libcpp/ * directives.c (struct if_stack): Use source_location as type here. * include/cpplib.h (struct cpp_callbacks): Properly use source_location as parameter type, rather than unsigned int. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@176333 138bc75d-0d04-0410-961f-82ee72b054a4 --- libcpp/ChangeLog | 8 ++++++++ libcpp/directives.c | 2 +- libcpp/include/cpplib.h | 14 +++++++------- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 6abcb25..9a9c71f 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,11 @@ +2011-07-15 Dodji Seketeli + + * directives.c (struct if_stack): Use source_location as type + here. + * include/cpplib.h (struct cpp_callbacks): Properly use + source_location as parameter type, rather than unsigned int. + 2011-07-07 Rainer Orth PR target/39150 diff --git a/libcpp/directives.c b/libcpp/directives.c index 85e941e..83d4a0e 100644 --- a/libcpp/directives.c +++ b/libcpp/directives.c @@ -32,7 +32,7 @@ along with this program; see the file COPYING3. If not see struct if_stack { struct if_stack *next; - linenum_type line; /* Line where condition started. */ + source_location line; /* Line where condition started. */ const cpp_hashnode *mi_cmacro;/* macro name for #ifndef around entire file */ bool skip_elses; /* Can future #else / #elif be skipped? */ bool was_skipping; /* If were skipping on entry. */ diff --git a/libcpp/include/cpplib.h b/libcpp/include/cpplib.h index 8fa2881..55b0f1b 100644 --- a/libcpp/include/cpplib.h +++ b/libcpp/include/cpplib.h @@ -479,12 +479,12 @@ struct cpp_callbacks void (*file_change) (cpp_reader *, const struct line_map *); void (*dir_change) (cpp_reader *, const char *); - void (*include) (cpp_reader *, unsigned int, const unsigned char *, + void (*include) (cpp_reader *, source_location, const unsigned char *, const char *, int, const cpp_token **); - void (*define) (cpp_reader *, unsigned int, cpp_hashnode *); - void (*undef) (cpp_reader *, unsigned int, cpp_hashnode *); - void (*ident) (cpp_reader *, unsigned int, const cpp_string *); - void (*def_pragma) (cpp_reader *, unsigned int); + void (*define) (cpp_reader *, source_location, cpp_hashnode *); + void (*undef) (cpp_reader *, source_location, cpp_hashnode *); + void (*ident) (cpp_reader *, source_location, const cpp_string *); + void (*def_pragma) (cpp_reader *, source_location); int (*valid_pch) (cpp_reader *, const char *, int); void (*read_pch) (cpp_reader *, const char *, int, const char *); missing_header_cb missing_header; @@ -501,8 +501,8 @@ struct cpp_callbacks /* Callbacks for when a macro is expanded, or tested (whether defined or not at the time) in #ifdef, #ifndef or "defined". */ - void (*used_define) (cpp_reader *, unsigned int, cpp_hashnode *); - void (*used_undef) (cpp_reader *, unsigned int, cpp_hashnode *); + void (*used_define) (cpp_reader *, source_location, cpp_hashnode *); + void (*used_undef) (cpp_reader *, source_location, cpp_hashnode *); /* Called before #define and #undef or other macro definition changes are processed. */ void (*before_define) (cpp_reader *); -- 2.7.4