aboutsummaryrefslogtreecommitdiff
path: root/gcc/cpplib.h
diff options
context:
space:
mode:
authorNeil Booth <neil@daikokuya.demon.co.uk>2001-08-22 20:37:20 +0000
committerNeil Booth <neil@gcc.gnu.org>2001-08-22 20:37:20 +0000
commit29401c300b273963c88bb08bb6282acdf11e75c2 (patch)
tree5d1c57d7edd200e5b5467bf355348a54e5238af3 /gcc/cpplib.h
parent8060c8ee523a6016589157d25ff9e82adc4ebb0c (diff)
downloadgcc-29401c300b273963c88bb08bb6282acdf11e75c2.zip
gcc-29401c300b273963c88bb08bb6282acdf11e75c2.tar.gz
gcc-29401c300b273963c88bb08bb6282acdf11e75c2.tar.bz2
cpperror.c (print_location): Don't show _Pragma.
* cpperror.c (print_location): Don't show _Pragma. * cppfiles.c (_cpp_pop_file_buffer): Handle -include file pushing and file change callback generation here. (stack_include_file): Update use of cpp_push_buffer. * cpphash.h (_cpp_pop_file_buffer): Update prototype. (struct cpp_buffer): Remove type, pfile members. * cppinit.c (cpp_handle_option): Use free_chain. * cpplex.c (_cpp_lex_token): Don't do -include file pushing here. (skip_escaped_newlines, get_effective_char, lex_percent): Take a cpp_reader rather than a cpp_buffer. (skip_escaped_newlines, get_effective_char, skip_block_comment, skip_line_comment, parse_string, lex_percent, lex_dot, _cpp_lex_token): Update accordingly. * cpplib.c (_cpp_pop_buffer): Don't do file change callback generation here. (cpp_push_buffer): Update prototype. (run_directive): Update use of cpp_push_buffer. (_cpp_do__Pragma, cpp_define, cpp_define_builtin, cpp_undef, handle_assertion): Update use of run_directive. * cpplib.h (enum cpp_buffer_type): Remove. (cpp_push_buffer): Update prototype. * fix-header.c (read_scan_file): Update. From-SVN: r45112
Diffstat (limited to 'gcc/cpplib.h')
-rw-r--r--gcc/cpplib.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/gcc/cpplib.h b/gcc/cpplib.h
index 9fc058d..8c49573 100644
--- a/gcc/cpplib.h
+++ b/gcc/cpplib.h
@@ -405,10 +405,6 @@ struct cpp_callbacks
/* Name under which this program was invoked. */
extern const char *progname;
-/* Where does this buffer come from? A source file, a builtin macro,
- a command-line option, or a _Pragma operator. */
-enum cpp_buffer_type {BUF_FILE, BUF_BUILTIN, BUF_CL_OPTION, BUF_PRAGMA};
-
/* The structure of a node in the hash table. The hash table has
entries for all identifiers: either macros defined by #define
commands (type NT_MACRO), assertions created with #assert
@@ -541,7 +537,7 @@ extern void cpp_unassert PARAMS ((cpp_reader *, const char *));
extern cpp_buffer *cpp_push_buffer PARAMS ((cpp_reader *,
const unsigned char *, size_t,
- enum cpp_buffer_type, int));
+ int, int));
extern int cpp_defined PARAMS ((cpp_reader *, const unsigned char *, int));
/* N.B. The error-message-printer prototypes have not been nicely