Changeset 784deab for include/dialog.h

Timestamp:

Jan 8, 2016, 10:37:10 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

61f9356

Parents:

1cced28

Message:

fix recursive include bug in shadow includes, major clean of examples, add several long long routines to prelude

File:

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

include/dialog.h

@@ -10 +10 @@
 // Created On       : Sun Jun 28 08:34:16 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jun 28 09:05:35 2015
-// Update Count     : 4
+// Last Modified On : Mon Dec 21 08:38:21 2015
+// Update Count     : 11
 
 // 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_DIALOG_H__
-#endif // type
-#include_next <dialog.h>
-#ifdef __CFA_DIALOG_H__
+#endif // ! type
+
+#include_next <dialog.h>                                                                // has internal check for multiple expansion
+
+#if defined( type ) && defined( __CFA_DIALOG_H__ )              // reset only if set
 #undef type
-#endif // __CFA_DIALOG_H__
+#undef __CFA_DIALOG_H__
+#endif // type && __CFA_DIALOG_H__
 
 // Local Variables: //