--- a/gcc/c-tree.h	Sun Aug 21 07:53:12 2011 +0900
+++ b/gcc/c-tree.h	Sun Aug 21 09:24:16 2011 +0900
@@ -70,12 +70,12 @@
 
 /* For FUNCTION_DECLs, evaluates true if the decl is built-in but has
    been declared.  */
-#define C_DECL_DECLARED_BUILTIN(EXP)        \
+#define C_DECL_DECLARED_BUILTIN(EXP)		\
   DECL_LANG_FLAG_3 (FUNCTION_DECL_CHECK (EXP))
 
 /* For FUNCTION_DECLs, evaluates true if the decl is built-in, has a
    built-in prototype and does not have a non-built-in prototype.  */
-#define C_DECL_BUILTIN_PROTOTYPE(EXP)       \
+#define C_DECL_BUILTIN_PROTOTYPE(EXP)		\
   DECL_LANG_FLAG_6 (FUNCTION_DECL_CHECK (EXP))
 
 /* Record whether a decl was declared register.  This is strictly a
@@ -199,9 +199,6 @@
   cts_float,
   cts_int128,
   cts_double,
-#ifndef noCbC
-  cts_CbC_code,
-#endif
   cts_dfloat32,
   cts_dfloat64,
   cts_dfloat128,
@@ -422,7 +419,7 @@
 extern void c_bindings_end_stmt_expr (struct c_spot_bindings *);
 
 extern void record_inline_static (location_t, tree, tree,
-                  enum c_inline_static_type);
+				  enum c_inline_static_type);
 extern void c_init_decl_processing (void);
 extern void c_print_identifier (FILE *, tree, int);
 extern int quals_from_declspecs (const struct c_declspecs *);
@@ -441,7 +438,7 @@
 extern struct c_spot_bindings *c_get_switch_bindings (void);
 extern void c_release_switch_bindings (struct c_spot_bindings *);
 extern bool c_check_switch_jump_warnings (struct c_spot_bindings *,
-                      location_t, location_t);
+					  location_t, location_t);
 extern void finish_decl (tree, location_t, tree, tree, tree);
 extern tree finish_enum (tree, tree, tree);
 extern void finish_function (void);
@@ -450,23 +447,17 @@
 extern struct c_arg_info *build_arg_info (void);
 extern struct c_arg_info *get_parm_info (bool);
 extern tree grokfield (location_t, struct c_declarator *,
-               struct c_declspecs *, tree, tree *);
+		       struct c_declspecs *, tree, tree *);
 extern tree groktypename (struct c_type_name *, tree *, bool *);
 extern tree grokparm (const struct c_parm *);
-
-#ifndef noCbC
-extern tree implicitly_declare (location_t, tree, int);
-#else
 extern tree implicitly_declare (location_t, tree);
-#endif
-
 extern void keep_next_level (void);
 extern void pending_xref_error (void);
 extern void c_push_function_context (void);
 extern void c_pop_function_context (void);
 extern void push_parm_decl (const struct c_parm *);
 extern struct c_declarator *set_array_declarator_inner (struct c_declarator *,
-                            struct c_declarator *);
+							struct c_declarator *);
 extern tree c_builtin_function (tree);
 extern tree c_builtin_function_ext_scope (tree);
 extern void shadow_tag (const struct c_declspecs *);
@@ -474,32 +465,32 @@
 extern tree start_enum (location_t, struct c_enum_contents *, tree);
 extern int  start_function (struct c_declspecs *, struct c_declarator *, tree);
 extern tree start_decl (struct c_declarator *, struct c_declspecs *, bool,
-            tree);
+			tree);
 extern tree start_struct (location_t, enum tree_code, tree,
-              struct c_struct_parse_info **);
+			  struct c_struct_parse_info **);
 extern void store_parm_decls (void);
 extern void store_parm_decls_from (struct c_arg_info *);
 extern tree xref_tag (enum tree_code, tree);
 extern struct c_typespec parser_xref_tag (location_t, enum tree_code, tree);
 extern int c_expand_decl (tree);
 extern struct c_parm *build_c_parm (struct c_declspecs *, tree,
-                    struct c_declarator *);
+				    struct c_declarator *);
 extern struct c_declarator *build_attrs_declarator (tree,
-                            struct c_declarator *);
+						    struct c_declarator *);
 extern struct c_declarator *build_function_declarator (struct c_arg_info *,
-                               struct c_declarator *);
+						       struct c_declarator *);
 extern struct c_declarator *build_id_declarator (tree);
 extern struct c_declarator *make_pointer_declarator (struct c_declspecs *,
-                             struct c_declarator *);
+						     struct c_declarator *);
 extern struct c_declspecs *build_null_declspecs (void);
 extern struct c_declspecs *declspecs_add_qual (struct c_declspecs *, tree);
 extern struct c_declspecs *declspecs_add_type (location_t,
-                           struct c_declspecs *,
-                           struct c_typespec);
+					       struct c_declspecs *,
+					       struct c_typespec);
 extern struct c_declspecs *declspecs_add_scspec (struct c_declspecs *, tree);
 extern struct c_declspecs *declspecs_add_attrs (struct c_declspecs *, tree);
 extern struct c_declspecs *declspecs_add_addrspace (struct c_declspecs *,
-                            addr_space_t);
+						    addr_space_t);
 extern struct c_declspecs *finish_declspecs (struct c_declspecs *);
 
 /* in c-objc-common.c */
@@ -538,12 +529,12 @@
 extern struct c_expr c_expr_sizeof_expr (location_t, struct c_expr);
 extern struct c_expr c_expr_sizeof_type (location_t, struct c_type_name *);
 extern struct c_expr parser_build_unary_op (location_t, enum tree_code,
-                            struct c_expr);
+    					    struct c_expr);
 extern struct c_expr parser_build_binary_op (location_t,
-                             enum tree_code, struct c_expr,
-                         struct c_expr);
+    					     enum tree_code, struct c_expr,
+					     struct c_expr);
 extern tree build_conditional_expr (location_t, tree, bool, tree, tree,
-                    tree, tree);
+				    tree, tree);
 extern tree build_compound_expr (location_t, tree, tree);
 extern tree c_cast_expr (location_t, struct c_type_name *, tree);
 extern tree build_c_cast (location_t, tree, tree);