Fix Lanes build by reorganizing types around a bit

1 files changed, 16 insertions, 8 deletions

diff --git a/src/universe.h b/src/universe.h
index 0ca5bf7..a75cead 100644
--- a/src/universe.h
+++ b/src/universe.h
@@ -6,7 +6,14 @@
 
 #include "lua.h"
 #include "threading.h"
-// MUTEX_T
+
+// forwards
+struct s_DeepPrelude;
+typedef struct s_DeepPrelude DeepPrelude;
+struct s_Keepers;
+typedef struct s_Keepers Keepers;
+struct s_Lane;
+typedef struct s_Lane Lane;
 
 // ################################################################################################
 
@@ -27,15 +34,15 @@ struct s_Universe
 
         lua_CFunction on_state_create_func;
 
-        struct s_Keepers* keepers;
+        Keepers* keepers;
 
         // Initialized by 'init_once_LOCKED()': the deep userdata Linda object
         // used for timers (each lane will get a proxy to this)
-        volatile struct DEEP_PRELUDE* timer_deep;  // = NULL
+        volatile DeepPrelude* timer_deep;  // = NULL
 
 #if HAVE_LANE_TRACKING
         MUTEX_T tracking_cs;
-        struct s_lane* volatile tracking_first; // will change to TRACKING_END if we want to activate tracking
+        Lane* volatile tracking_first; // will change to TRACKING_END if we want to activate tracking
 #endif // HAVE_LANE_TRACKING
 
         MUTEX_T selfdestruct_cs;
@@ -53,14 +60,15 @@ struct s_Universe
         int debugspew_indent_depth;
 #endif // USE_DEBUG_SPEW
 
-        struct s_lane* volatile selfdestruct_first;
+        Lane* volatile selfdestruct_first;
         // After a lane has removed itself from the chain, it still performs some processing.
         // The terminal desinit sequence should wait for all such processing to terminate before force-killing threads
         int volatile selfdestructing_count;
 };
+typedef struct s_Universe Universe;
 
-struct s_Universe* universe_get( lua_State* L);
-struct s_Universe* universe_create( lua_State* L);
-void universe_store( lua_State* L, struct s_Universe* U);
+Universe* universe_get( lua_State* L);
+Universe* universe_create( lua_State* L);
+void universe_store( lua_State* L, Universe* U);
 
 #endif // UNIVERSE_H