diff options
| author | Ziemowit Laski <zlaski@apple.com> | 2002-08-10 02:18:28 +0000 |
|---|---|---|
| committer | Ziemowit Laski <zlaski@gcc.gnu.org> | 2002-08-10 02:18:28 +0000 |
| commit | 0f7866e7ba109bc68ae2c0d14ec0399765fc144b (patch) | |
| tree | 9eae3f190177c258108b75e7081a965f0c60e1f2 /gcc/cppinit.c | |
| parent | 9e259dd1ff3f146f89ff4261d9e48685b378b693 (diff) | |
| download | gcc-0f7866e7ba109bc68ae2c0d14ec0399765fc144b.zip gcc-0f7866e7ba109bc68ae2c0d14ec0399765fc144b.tar.gz gcc-0f7866e7ba109bc68ae2c0d14ec0399765fc144b.tar.bz2 | |
c-common.c (flag_objc): New.
2002-08-09 Ziemowit Laski <zlaski@apple.com>
* c-common.c (flag_objc): New.
* c-common.h (c_language_kind): Get rid of clk_objective_c
enum value.
(flag_objc): New extern declaration.
* c-decl.c (implicitly_declare): Call objc_check_decl
instead of maybe_objc_check_decl.
(finish_decl): Likewise.
(grokfield): Likewise.
(finish_struct): Likewise.
* c-lang.c (maybe_objc_check_decl): Rename to objc_check_decl.
(maybe_objc_comptypes): Rename to objc_comptypes.
(maybe_building_objc_message_expr): Rename to
objc_message_selector.
* c-lex.c (lex_charconst): Remove uses of clk_objective_c,
replace with flag_objc as needed.
* c-opts.c (c_common_init_options): Likewise.
(c_common_decode_option): Likewise.
* c-parse.in (init_reswords): Likewise.
* c-tree.h (maybe_objc_check_decl): Rename to objc_check_decl.
(maybe_objc_comptypes): Rename to objc_comptypes.
(maybe_building_objc_message_expr): Rename to
objc_message_selector.
* c-typeck.c (comptypes): Call objc_comptypes instead of
maybe_objc_comptypes, and/or objc_message_selector instead of
(comp_target_types): Likewise.
(convert_for_assignment): Likewise.
(warn_for_assignment): Likewise.
* cppinit.c (init_builtins): Set __OBJC__ manifest constant
independently of those for other languages.
* objc/objc-act.c (maybe_objc_comptypes): Delete.
(maybe_objc_check_decl): Delete.
(maybe_building_objc_message_expr): Rename to
objc_message_selector.
* objc/objc-lang.c (objc_init_options): Use clk_c instead of
clk_objective_c; set flag_objc flag.
From-SVN: r56173
Diffstat (limited to 'gcc/cppinit.c')
| -rw-r--r-- | gcc/cppinit.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gcc/cppinit.c b/gcc/cppinit.c index b7d204c..212da6b 100644 --- a/gcc/cppinit.c +++ b/gcc/cppinit.c @@ -694,16 +694,16 @@ init_builtins (pfile) if (CPP_OPTION (pfile, cplusplus)) _cpp_define_builtin (pfile, "__cplusplus 1"); - else if (CPP_OPTION (pfile, objc)) - _cpp_define_builtin (pfile, "__OBJC__ 1"); else if (CPP_OPTION (pfile, lang) == CLK_ASM) _cpp_define_builtin (pfile, "__ASSEMBLER__ 1"); - - if (CPP_OPTION (pfile, lang) == CLK_STDC94) + else if (CPP_OPTION (pfile, lang) == CLK_STDC94) _cpp_define_builtin (pfile, "__STDC_VERSION__ 199409L"); else if (CPP_OPTION (pfile, c99)) _cpp_define_builtin (pfile, "__STDC_VERSION__ 199901L"); + if (CPP_OPTION (pfile, objc)) + _cpp_define_builtin (pfile, "__OBJC__ 1"); + if (pfile->cb.register_builtins) (*pfile->cb.register_builtins) (pfile); } |