Clean up globals.

2 files changed, 2 insertions, 6 deletions

diff --git a/src/GuiLua/GuiLua.c b/src/GuiLua/GuiLua.c
index 46e0d1e..4b5ccd9 100644
--- a/src/GuiLua/GuiLua.c
+++ b/src/GuiLua/GuiLua.c
@@ -1110,7 +1110,6 @@ int luaopen_GuiLua(lua_State *L)
   int skang;
 
   // In theory this function only ever gets called once.
-  memset(&ourGlobals, 0, sizeof(globals));
   ourGlobals.logDom = loggingStartup("GuiLua", ourGlobals.logDom);
 
   elm_policy_set(ELM_POLICY_EXIT,       ELM_POLICY_EXIT_NONE);
diff --git a/src/GuiLua/GuiLua.h b/src/GuiLua/GuiLua.h
index 2e2a616..42442cf 100644
--- a/src/GuiLua/GuiLua.h
+++ b/src/GuiLua/GuiLua.h
@@ -3,9 +3,6 @@
 #include "Runnr.h"
 
 
-typedef struct _globals globals;
-
-
 #define WIDTH  (300)
 #define HEIGHT (300)
 
@@ -15,13 +12,13 @@ typedef struct _globals globals;
 #define THINGASM        "thingasm"
 
 
-struct _globals
+typedef struct _globals
 {
   Evas          *evas;
   Evas_Object   *win;           // Our Elm window.
   Eina_Clist    widgets;        // Our windows widgets.
   int           logDom;         // Our logging domain.
-};
+} globals;
 
 
 int luaopen_widget(lua_State *L);