Changeset 66f8528 for src/libcfa/stdhdr

Timestamp:

Dec 15, 2016, 5:16:42 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, stuck-waitfor-destruct, with_gc

Children:

43385ca, f7ff3fb

Parents:

5802a4f (diff), 596f987b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into tuples

Conflicts:

src/ResolvExpr/CommonType.cc
src/tests/.expect/32/extension.txt
src/tests/.expect/32/gccExtensions.txt
src/tests/.expect/64/declarationSpecifier.txt
src/tests/.expect/64/extension.txt
src/tests/.expect/64/gccExtensions.txt
src/tests/.expect/castError.txt
src/tests/Makefile.am

File:

• src/libcfa/stdhdr/assert.h (modified) (1 diff)

src/libcfa/stdhdr/assert.h

@@ -14 +14 @@
 // 
 
+#ifdef __CFORALL__
 extern "C" {
-#include_next <assert.h>                                                                // has internal check for multiple expansion
+#endif //__CFORALL__
+
+// has internal check for multiple expansion
+#include_next <assert.h>
+
+#ifdef __CFORALL__
 } // extern "C"
+#endif //__CFORALL__
 
 // Local Variables: //