From 4d95970ef86f8387bc9a509112153a74f82e016c Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sat, 25 Feb 2012 03:34:13 +1000
Subject: Merge the luaproc and script structures, but not using it yet.

---
 LuaSL/src/LuaSL.h | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'LuaSL/src')

diff --git a/LuaSL/src/LuaSL.h b/LuaSL/src/LuaSL.h
index 68deec5..bde4c2f 100644
--- a/LuaSL/src/LuaSL.h
+++ b/LuaSL/src/LuaSL.h
@@ -19,6 +19,8 @@
 #include <lualib.h>
 #include <lauxlib.h>
 
+typedef struct _script script;	// Define this here, so LuaSL_threads.h can use it.
+
 #include "LuaSL_threads.h"
 
 
@@ -68,7 +70,7 @@ typedef struct
     boolean		ui;		// Wether we actually start up the UI.
 } gameGlobals;
 
-typedef struct
+struct _script
 {
     Eina_Clist		node;
     gameGlobals		*game;
@@ -79,16 +81,12 @@ typedef struct
     float		compileTime, timerTime;
     int			bugs, warnings;
     boolean		running;
+    int			status;
+    int			args;
+    channel		chan;
     Ecore_Con_Client	*client;
     Ecore_Timer		*timer;
-} script;
-
-//struct stluaproc {
-//	int stat;
-//	int args;
-//	channel chan;
-//	void *data;
-//};
+};
 
 typedef struct
 {
-- 
cgit v1.1