aboutsummaryrefslogtreecommitdiff
path: root/gcc/c-lang.c
diff options
context:
space:
mode:
authorNeil Booth <neil@daikokuya.co.uk>2003-06-30 19:36:25 +0000
committerNeil Booth <neil@gcc.gnu.org>2003-06-30 19:36:25 +0000
commit37fa72e9d359a0c00c3b62e9aabd74276daa6602 (patch)
tree01d40120cc52c2574f790a44609bf19f0551b019 /gcc/c-lang.c
parent4497827651d07fa10006fbac4cf63a92cf83c2a2 (diff)
downloadgcc-37fa72e9d359a0c00c3b62e9aabd74276daa6602.zip
gcc-37fa72e9d359a0c00c3b62e9aabd74276daa6602.tar.gz
gcc-37fa72e9d359a0c00c3b62e9aabd74276daa6602.tar.bz2
c-common.c (enum c_language_kind, flag_objc): Remove.
* c-common.c (enum c_language_kind, flag_objc): Remove. (fix_string_type, check_case_value, c_common_nodes_and_builtins, c_add_case_label, finish_label_addr_expr, boolean_increment): Use c_dialect_ macros. * c-common.h (enum c_language_kind): Extend. (c_dialect_cxx, c_dialect_objc): New. (flag_objc): Remove. (c_common_init_options): Update prototype. * c-cppbuiltin.c (define__GNUC__, c_cpp_builtins): Use c_dialect_ macros. * c-decl.c (finsih_decl, grokfield, finish_struct): Use c_dialect_ macros. * c-format.c (C_STD_VER, C_STD_NAME): Similarly. * c-lang.c (c_init_options): Remove. (c_language): Define. (LANG_HOOKS_INIT_OPTIONS): Use common hook. * c-lex.c (lex_charconst): Use c_dialect_cxx(). * c-opts.c (lang_flags): Make function-local. (c_common_init_options): Use c_dialect_ macros. Handle C++ diagnostic requirements. (c_common_handle_option, c_common_post_options): Use flag_cxx. * c-parse.in (init_reswords): Use c_dialect_objc (). * c-pch.c (get_ident): Use c_language. * c-pretty-print.c (pp_c_bool_literal): Use c_dialect_ macros. * c-typeck.c (comptypes, build_c_cast): Similarly. * objc/objc-lang.c (c_language): Define. (LANG_HOOKS_INIT_OPTIONS): Use common hook. (objc_init_options): Remove. cp: * Make-lang.in: Update. * cp-lang.c (c_language): Define. (LANG_HOOKS_INIT_OPTIONS): Use common hook. * cp-tree.h (cxx_init_options): Remove. * lex.c: Don't include diagnostic.h. (cxx_init_options): Remove. From-SVN: r68734
Diffstat (limited to 'gcc/c-lang.c')
-rw-r--r--gcc/c-lang.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/gcc/c-lang.c b/gcc/c-lang.c
index 6d8c89a..5da15e5 100644
--- a/gcc/c-lang.c
+++ b/gcc/c-lang.c
@@ -31,7 +31,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include "langhooks.h"
#include "langhooks-def.h"
-static int c_init_options (void);
+enum c_language_kind c_language = clk_c;
/* ### When changing hooks, consider if ObjC needs changing too!! ### */
@@ -42,7 +42,7 @@ static int c_init_options (void);
#undef LANG_HOOKS_FINISH
#define LANG_HOOKS_FINISH c_common_finish
#undef LANG_HOOKS_INIT_OPTIONS
-#define LANG_HOOKS_INIT_OPTIONS c_init_options
+#define LANG_HOOKS_INIT_OPTIONS c_common_init_options
#undef LANG_HOOKS_HANDLE_OPTION
#define LANG_HOOKS_HANDLE_OPTION c_common_handle_option
#undef LANG_HOOKS_POST_OPTIONS
@@ -159,12 +159,6 @@ const char *const tree_code_name[] = {
};
#undef DEFTREECODE
-static int
-c_init_options (void)
-{
- return c_common_init_options (clk_c);
-}
-
/* Used by c-lex.c, but only for objc. */
tree