[llvm-commits] [llvm-gcc-4.2] r46261 - /llvm-gcc-4.2/trunk/gcc/objc/objc-act.c

[Bill Wendling]

Author: void
Date: Tue Jan 22 17:06:58 2008
New Revision: 46261

URL: http://llvm.org/viewvc/llvm-project?rev=46261&view=rev
Log:
We were getting this error:

	embedding a directive within macro arguments is not portable

build_tree_list is a macro...

Modified:
    llvm-gcc-4.2/trunk/gcc/objc/objc-act.c

Modified: llvm-gcc-4.2/trunk/gcc/objc/objc-act.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/objc/objc-act.c?rev=46261&r1=46260&r2=46261&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/objc/objc-act.c (original)
+++ llvm-gcc-4.2/trunk/gcc/objc/objc-act.c Tue Jan 22 17:06:58 2008
@@ -10867,14 +10867,14 @@
 
   /* LLVM LOCAL begin make initializer size match type size */
   /* APPLE LOCAL ObjC new abi */
-  initlist = build_tree_list (NULL_TREE, build_int_cst (
 #ifdef OBJCPLUS
-                              NULL_TREE,
+  initlist = build_tree_list (NULL_TREE,
+			      build_int_cst (NULL_TREE, init_val));
 #else
-                              newabi ? NULL_TREE : ptr_type_node,
+  initlist = build_tree_list (NULL_TREE,
+                              build_int_cst (newabi ? NULL_TREE : ptr_type_node,
+					     init_val));
 #endif
-
-                                                        init_val));
   /* LLVM LOCAL end */
   initlist = tree_cons (NULL_TREE, build_int_cst (NULL_TREE, size), initlist);
   initlist = tree_cons (NULL_TREE, list, initlist);