Enlightenment CVS committal Author : raster Project : e17 Module : apps/e
Dir : e17/apps/e/src/lib Modified Files: E.h e_main.c e_private.h Log Message: fix up include system so u canhave one struct directly reference another (put typedefs in separate section and include twice... =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/lib/E.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- E.h 8 Jan 2005 01:44:36 -0000 1.2 +++ E.h 12 Jan 2005 16:03:09 -0000 1.3 @@ -1,7 +1,6 @@ #ifndef _E_H #define _E_H - #ifdef EAPI #undef EAPI #endif @@ -19,9 +18,6 @@ # endif #endif -extern EAPI int E_RESPONSE_MODULE_LIST; -extern EAPI int E_RESPONSE_BACKGROUND_GET; - typedef struct _E_Response_Module_List E_Response_Module_List; typedef struct _E_Response_Background_Get E_Response_Background_Get; @@ -36,23 +32,20 @@ char *data; }; +extern EAPI int E_RESPONSE_MODULE_LIST; +extern EAPI int E_RESPONSE_BACKGROUND_GET; #ifdef __cplusplus extern "C" { #endif - /* edje_main.c */ EAPI int e_init (const char *display); EAPI int e_shutdown (void); - - EAPI void e_module_enabled_set (const char *module, - int enable); - EAPI void e_module_loaded_set (const char *module, - int load); + EAPI void e_module_enabled_set (const char *module, int enable); + EAPI void e_module_loaded_set (const char *module, int load); EAPI void e_module_list (void); EAPI void e_background_set (const char *bgfile); EAPI void e_background_get (void); - #ifdef __cplusplus } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/lib/e_main.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_main.c 8 Jan 2005 01:44:36 -0000 1.2 +++ e_main.c 12 Jan 2005 16:03:09 -0000 1.3 @@ -19,7 +19,6 @@ #include "E.h" #include "e_private.h" - #include <Ecore.h> #include <Ecore_Ipc.h> =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/lib/e_private.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_private.h 6 Jan 2005 23:10:56 -0000 1.1 +++ e_private.h 12 Jan 2005 16:03:09 -0000 1.2 @@ -1,11 +1,13 @@ -#ifndef _EDJE_PRIVATE_H -#define _EDJE_PRIVATE_H +#ifndef _E_PRIVATE_H +#define _E_PRIVATE_H #ifdef HAVE_CONFIG_H #include <config.h> #endif +#define E_TYPEDEFS 1 +#include "e_ipc.h" +#undef E_TYPEDEFS #include "e_ipc.h" - #endif ------------------------------------------------------- The SF.Net email is sponsored by: Beat the post-holiday blues Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek. It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs