aboutsummaryrefslogtreecommitdiff
path: root/gcc/cpplib.h
diff options
context:
space:
mode:
authorZack Weinberg <zack@wolery.cumb.org>2000-03-07 20:58:47 +0000
committerZack Weinberg <zack@gcc.gnu.org>2000-03-07 20:58:47 +0000
commitb0699daddf1eead3861e67808ac915f21f82dcf3 (patch)
tree1a0ac2a2bf6f6751175dddcf0bf7464c1266fe1a /gcc/cpplib.h
parent79e69af0254238d0b5fa1940c5f7ecfce9e11bcd (diff)
downloadgcc-b0699daddf1eead3861e67808ac915f21f82dcf3.zip
gcc-b0699daddf1eead3861e67808ac915f21f82dcf3.tar.gz
gcc-b0699daddf1eead3861e67808ac915f21f82dcf3.tar.bz2
cppfiles.c (_cpp_find_include_file): Make sure ih->name is initialized.
* cppfiles.c (_cpp_find_include_file): Make sure ih->name is initialized. * cppinit.c (cpp_cleanup): Free imp->nshort also. * cpperror.c (cpp_print_containing_files, cpp_print_file_and_line, v_cpp_message): Rename to print_containing_files, print_file_and_line, and v_message. * cppexp.c (cpp_parse_expr, cpp_parse_escape, cpp_lex): Rename to _cpp_parse_expr, parse_escape, and lex. (parse_charconst): Remove broken multibyte support. * cppfiles.c (include_hash): Make static. (cpp_included): New function. (merge_include_chains, find_include_file, finclude, simplify_pathname): Rename to _cpp_merge_include_chains, _cpp_find_include_file, _cpp_read_include_file, and _cpp_simplify_pathname. * cpphash.c (cpp_lookup, free_definition, delete_macro, cpp_install, create_definition, macroexpand, compare_defs, dump_definition): Rename to _cpp_lookup, _cpp_free_definition, _cpp_delete_macro, _cpp_install, _cpp_create_definition, _cpp_macroexpand, _cpp_compare_defs, and _cpp_dump_definition. * cppinit.c (cpp_handle_option): Rename to handle_option, make static. * cpplib.c: Remove extern prototype of cpp_parse_expr. * cpphash.h: Update prototypes. * cpplib.h: Likewise. Prototype _cpp_parse_expr here. From-SVN: r32390
Diffstat (limited to 'gcc/cpplib.h')
-rw-r--r--gcc/cpplib.h18
1 files changed, 11 insertions, 7 deletions
diff --git a/gcc/cpplib.h b/gcc/cpplib.h
index 19a9c3e..bb098c2 100644
--- a/gcc/cpplib.h
+++ b/gcc/cpplib.h
@@ -64,7 +64,6 @@ enum cpp_token
typedef enum cpp_token (*parse_underflow_t) PARAMS((cpp_reader *));
typedef int (*parse_cleanup_t) PARAMS((cpp_buffer *, cpp_reader *));
-extern int cpp_handle_option PARAMS ((cpp_reader *, int, char **));
extern int cpp_handle_options PARAMS ((cpp_reader *, int, char **));
extern enum cpp_token cpp_get_token PARAMS ((cpp_reader *));
extern enum cpp_token cpp_get_non_space_token PARAMS ((cpp_reader *));
@@ -694,16 +693,21 @@ extern void output_line_command PARAMS ((cpp_reader *,
enum file_change_code));
/* In cppfiles.c */
-extern void simplify_pathname PARAMS ((char *));
-extern void merge_include_chains PARAMS ((struct cpp_options *));
-extern int find_include_file PARAMS ((cpp_reader *, const char *,
+extern int cpp_included PARAMS ((cpp_reader *, const char *));
+extern int cpp_read_file PARAMS ((cpp_reader *, const char *));
+
+extern void _cpp_simplify_pathname PARAMS ((char *));
+extern void _cpp_merge_include_chains PARAMS ((struct cpp_options *));
+extern int _cpp_find_include_file PARAMS ((cpp_reader *, const char *,
struct file_name_list *,
struct include_hash **,
int *));
-extern int finclude PARAMS ((cpp_reader *, int,
+extern int _cpp_read_include_file PARAMS ((cpp_reader *, int,
struct include_hash *));
-extern int cpp_read_file PARAMS ((cpp_reader *, const char *));
-extern struct include_hash *include_hash PARAMS ((cpp_reader *, const char *, int));
+
+/* In cppexp.c */
+extern HOST_WIDEST_INT _cpp_parse_expr PARAMS ((cpp_reader *));
+
#ifdef __cplusplus
}