From 205c2b6eaa23c04691f92ad0d60407f98eed766b Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Mon, 5 May 2014 20:43:02 +1000 Subject: Clean up include files. --- src/GuiLua/GuiLua.c | 4 ---- src/GuiLua/GuiLua.h | 10 ++++++++++ src/GuiLua/skang.c | 3 --- src/GuiLua/test_c.c | 4 +--- src/extantz/CDemo.cpp | 1 - src/extantz/camera.c | 1 + src/extantz/ephysics_demo.c | 1 + src/extantz/extantz.c | 2 ++ src/extantz/extantz.h | 15 +++++++++------ src/libraries/LumbrJack.h | 5 +++++ src/libraries/Runnr.h | 5 ++++- src/libraries/SledjHamr.h | 6 +++++- src/libraries/winFang.h | 6 ++++++ 13 files changed, 44 insertions(+), 19 deletions(-) diff --git a/src/GuiLua/GuiLua.c b/src/GuiLua/GuiLua.c index 4bed9ca..7463abb 100644 --- a/src/GuiLua/GuiLua.c +++ b/src/GuiLua/GuiLua.c @@ -139,12 +139,8 @@ and ordinary elementary widgets. Proper introspection can come later. */ -#include "SledjHamr.h" #include "LumbrJack.h" -#include "Runnr.h" -#include "winFang.h" #include "GuiLua.h" -//#include static int logDom; // Our logging domain. diff --git a/src/GuiLua/GuiLua.h b/src/GuiLua/GuiLua.h index c0fa9c7..3548a44 100644 --- a/src/GuiLua/GuiLua.h +++ b/src/GuiLua/GuiLua.h @@ -1,3 +1,11 @@ +#ifndef _GUILUA_H_ +#define _GUILUA_H_ + + +#include "Runnr.h" +#include "winFang.h" + + #define WIDTH (300) #define HEIGHT (300) @@ -19,3 +27,5 @@ typedef struct _GuiLua } GuiLua; GuiLua *GuiLuaDo(int argc, char **argv, Evas_Object *parent); + +#endif diff --git a/src/GuiLua/skang.c b/src/GuiLua/skang.c index a0dca5c..ed6d31f 100644 --- a/src/GuiLua/skang.c +++ b/src/GuiLua/skang.c @@ -1,7 +1,4 @@ #include "SledjHamr.h" -#include "LumbrJack.h" -#include "Runnr.h" -#include "winFang.h" #include "GuiLua.h" diff --git a/src/GuiLua/test_c.c b/src/GuiLua/test_c.c index 6421d24..f548e4d 100644 --- a/src/GuiLua/test_c.c +++ b/src/GuiLua/test_c.c @@ -10,10 +10,8 @@ http://lua-users.org/lists/lua-l/2008-01/msg00671.html */ -#include "SledjHamr.h" -#include "LumbrJack.h" +//#include "LumbrJack.h" #include "Runnr.h" -#include "winFang.h" #include "GuiLua.h" diff --git a/src/extantz/CDemo.cpp b/src/extantz/CDemo.cpp index 7151b5f..f9363c5 100644 --- a/src/extantz/CDemo.cpp +++ b/src/extantz/CDemo.cpp @@ -3,7 +3,6 @@ #include #include "extantz.h" -#include "extantzCamera.h" #include "CDemo.h" CDemo::CDemo(GLData *gld, bool a) diff --git a/src/extantz/camera.c b/src/extantz/camera.c index e566fbb..d221ea0 100644 --- a/src/extantz/camera.c +++ b/src/extantz/camera.c @@ -1,5 +1,6 @@ #include "extantz.h" + static void _on_camera_input_down(void *data, Evas *evas, Evas_Object *obj, void *event_info) { globals *ourGlobals = data; diff --git a/src/extantz/ephysics_demo.c b/src/extantz/ephysics_demo.c index f5036b9..6697cc9 100644 --- a/src/extantz/ephysics_demo.c +++ b/src/extantz/ephysics_demo.c @@ -1,4 +1,5 @@ #include "extantz.h" +#include #if USE_PHYSICS diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c index 7346aea..d0cd8ef 100644 --- a/src/extantz/extantz.c +++ b/src/extantz/extantz.c @@ -1,4 +1,6 @@ #include "extantz.h" +#include "SledjHamr.h" +#include "LumbrJack.h" static int logDom; // Our logging domain. diff --git a/src/extantz/extantz.h b/src/extantz/extantz.h index 969ac98..4ecf8e8 100644 --- a/src/extantz/extantz.h +++ b/src/extantz/extantz.h @@ -1,19 +1,20 @@ +#ifndef _EXTANTZ_H_ +#define _EXTANTZ_H_ + #define USE_PHYSICS 1 #define USE_IRR 0 #define USE_DEMO 0 #define DO_GEARS 0 -#include "SledjHamr.h" -#include "LumbrJack.h" +#include "winFang.h" +#include "GuiLua.h" + #include #include #include -#include "extantzCamera.h" -#include "winFang.h" -#include "Runnr.h" -#include "GuiLua.h" +#include "extantzCamera.h" #ifdef GL_GLES #include @@ -264,3 +265,5 @@ winFang *woMan_add(globals *ourGlobals); #ifdef __cplusplus } #endif + +#endif diff --git a/src/libraries/LumbrJack.h b/src/libraries/LumbrJack.h index 5ac0ce8..a096e7f 100644 --- a/src/libraries/LumbrJack.h +++ b/src/libraries/LumbrJack.h @@ -1,3 +1,6 @@ +#ifndef _LUMBRJACK_H_ +#define _LUMBRJACK_H_ + #include #include @@ -30,3 +33,5 @@ typedef enum int loggingStartup(char *name, int logDom); char *getDateTime(struct tm **nowOut, char *dateOut, time_t *tiemOut); + +#endif diff --git a/src/libraries/Runnr.h b/src/libraries/Runnr.h index dc720ff..ac22039 100644 --- a/src/libraries/Runnr.h +++ b/src/libraries/Runnr.h @@ -1,5 +1,6 @@ +#ifndef _RUNNR_H_ +#define _RUNNR_H_ -#include #include #include @@ -13,3 +14,5 @@ void dumpStack(lua_State *L, int i); int pull_lua(lua_State *L, int i, char *params, ...); int push_lua(lua_State *L, char *params, ...); + +#endif diff --git a/src/libraries/SledjHamr.h b/src/libraries/SledjHamr.h index 893d90e..2351507 100644 --- a/src/libraries/SledjHamr.h +++ b/src/libraries/SledjHamr.h @@ -1,3 +1,6 @@ +#ifndef _SLEDJHAMR_H_ +#define _SLEDJHAMR_H_ + #define EFL_API_OVERRIDE 1 /* Enable access to unstable EFL API that are still in beta */ @@ -5,10 +8,11 @@ /* Enable access to unstable EFL EO API. */ #define EFL_EO_API_SUPPORT 1 -#include #include #include void HamrTime(void *elm_main, char *domain); + +#endif diff --git a/src/libraries/winFang.h b/src/libraries/winFang.h index 219dcf0..38487cc 100644 --- a/src/libraries/winFang.h +++ b/src/libraries/winFang.h @@ -1,3 +1,7 @@ +#ifndef _WINFANG_H_ +#define _WINFANG_H_ + + #define EFL_API_OVERRIDE 1 /* Enable access to unstable EFL API that are still in beta */ #define EFL_BETA_API_SUPPORT 1 @@ -47,3 +51,5 @@ void winFangShow(winFang *win); void winFangDel(winFang *win); Widget *widgetAdd(winFang *win, const Eo_Class *klass, Evas_Object *parent, char *title); + +#endif -- cgit v1.1