[llvm-commits] [llvm-gcc-4.2] r67342 - /llvm-gcc-4.2/trunk/gcc/tree.c

[Bill Wendling]

Author: void
Date: Thu Mar 19 17:14:10 2009
New Revision: 67342

URL: http://llvm.org/viewvc/llvm-project?rev=67342&view=rev
Log:
This file had a merge problem. Fixed.

Modified:
    llvm-gcc-4.2/trunk/gcc/tree.c

Modified: llvm-gcc-4.2/trunk/gcc/tree.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/tree.c?rev=67342&r1=67341&r2=67342&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/tree.c (original)
+++ llvm-gcc-4.2/trunk/gcc/tree.c Thu Mar 19 17:14:10 2009
@@ -7961,4 +7961,19 @@
 }
 #endif
 /* LLVM LOCAL end */
+
+/* APPLE LOCAL begin weak_import on property 6676828 */
+static GTY(()) int objc_property_decl_context;
+
+void note_objc_property_decl_context (void) {
+  objc_property_decl_context = 1;
+}
+void note_end_objc_property_decl_context (void) {
+  objc_property_decl_context = 0;
+}
+bool in_objc_property_decl_context (void) {
+  return objc_property_decl_context;
+}
+/* APPLE LOCAL end weak_import on property 6676828 */
+
 #include "gt-tree.h"