--- a/obj.h Mon Feb 16 18:09:03 2004 +0100 +++ b/obj.h Mon Feb 16 18:50:28 2004 +0100 @@ -18,9 +18,9 @@ #define OBJ_CAST(OBJ, TYPE) (TYPE*)obj_cast((Obj*)OBJ, &CLASSDESCR(TYPE)) #define INTRSTRUCT(STRU) \ - struct STRU##_struct; typedef struct STRU##_struct STRU + struct STRU##_struct; typedef struct STRU##_struct STRU #define DECLSTRUCT(STRU) \ - struct STRU##_struct + struct STRU##_struct #define INTRCLASS(OBJ) INTRSTRUCT(OBJ); extern ClassDescr CLASSDESCR(OBJ) #define DECLCLASS(OBJ) DECLSTRUCT(OBJ) @@ -36,9 +36,9 @@ extern void destroy_obj(Obj *obj); DECLCLASS(Obj){ - ClassDescr *obj_type; - Watch *obj_watches; - int flags; + ClassDescr *obj_type; + Watch *obj_watches; + int flags; }; #define OBJ_DEST 0x0001 @@ -53,13 +53,13 @@ #define WWATCH_INIT {NULL, NULL, NULL, NULL} DECLSTRUCT(Watch){ - Obj *obj; - Watch *next, *prev; - WatchHandler *handler; + Obj *obj; + Watch *next, *prev; + WatchHandler *handler; }; extern bool watch_setup(Watch *watch, Obj *obj, - WatchHandler *handler); + WatchHandler *handler); extern void watch_reset(Watch *watch); extern bool watch_ok(Watch *watch); extern void watch_init(Watch *watch);