Changeset 3526

Timestamp:

05/01/05 12:32:56 (7 years ago)

Author:

westram

Message:

- GB_INCLUDED conditionals removed
- changed include wrapper

Files:

• trunk/WINDOW/aw_root.hxx (modified) (4 diffs)

trunk/WINDOW/aw_root.hxx

@@ -231 +231 @@
 typedef void (*Awar_CB0)(AW_root *);
 
+typedef struct gb_data_base_type GBDATA;
+
 class AW_awar {
     struct {
@@ -250 +252 @@
     // read only
     class AW_root               *root;
-#ifdef GB_INCLUDED
     friend void AW_var_gbdata_callback_delete_intern(GBDATA *gbd, int *cl);
 
     GBDATA           *gb_var;
     GBDATA           *gb_origin;
-#else
-    void             *gb_var;
-    void             *gb_origin;
-#endif
+    
     // read only
     void              run_callbacks();
@@ -321 +319 @@
 
 bool ARB_global_awars_initialized();
-#ifdef GB_INCLUDED
 void ARB_init_global_awars(AW_root *aw_root, AW_default aw_def, GBDATA *gb_main);
-#endif
 
 // ----------------------------------
@@ -361 +357 @@
 };
 
-
-
-#endif
+#else
+#error aw_root.hxx included twice
+#endif