Changeset 36874e4 for include/expat.h

Timestamp:

Jan 12, 2016, 3:36:20 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

ebe9b3a

Parents:

b18b0b5 (diff), 61f9356 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• include/expat.h (modified) (1 diff)

include/expat.h

@@ -10 +10 @@
 // Created On       : Sun Jun 28 11:10:15 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jun 28 11:14:28 2015
-// Update Count     : 2
+// Last Modified On : Mon Dec 21 08:57:26 2015
+// Update Count     : 4
 
 // This include file uses the CFA keyword "type" as a field name of a structure.
-// The name is changed only for the include file.
 
-#ifndef type    // nesting ?
+#if ! defined( type )                                                                   // nesting ?
 #define type `type`
 #define __CFA_EXPAT1_H__
-#endif // type
-#ifndef context // nesting ?
+#endif // ! type
+
+#if ! defined( context )                                                                // nesting ?
 #define context `context`
 #define __CFA_EXPAT2_H__
-#endif // context
-#include_next <expat.h>
-#ifdef __CFA_EXPAT1_H__
+#endif // ! context
+
+#include_next <expat.h>                                                                 // has internal check for multiple expansion
+
+#if defined( type ) && defined( __CFA_EXPAT1_H__ )              // reset only if set
 #undef type
-#endif // __CFA_EXPAT_H__
-#ifdef __CFA_EXPAT2_H__
-#undef type
-#endif // __CFA_EXPAT2_H__
+#undef __CFA_EXPAT1_H__
+#endif // type && __CFA_EXPAT1_H__
+
+#if defined( context ) && defined( __CFA_EXPAT2_H__ )   // reset only if set
+#undef context
+#undef __CFA_EXPAT2_H__
+#endif // context && __CFA_EXPAT2_H__
 
 // Local Variables: //