ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=ed4560dbaa49507457a2387d160cfe165aad13ba
commit ed4560dbaa49507457a2387d160cfe165aad13ba Author: Andy Williams <[email protected]> Date: Wed Dec 24 18:06:51 2014 +0000 Remove circular include of the elm_code_file.h header --- elm_code/lib/elm_code_common.h | 3 +-- elm_code/lib/elm_code_file.h | 4 ++-- elm_code/lib/elm_code_widget.h | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/elm_code/lib/elm_code_common.h b/elm_code/lib/elm_code_common.h index 79f5d6c..eafe106 100644 --- a/elm_code/lib/elm_code_common.h +++ b/elm_code/lib/elm_code_common.h @@ -5,6 +5,7 @@ #include <Eina.h> typedef struct _Elm_Code Elm_Code; +typedef struct _Elm_Code_File Elm_Code_File; EAPI extern const Eo_Event_Description ELM_CODE_EVENT_LINE_SET_DONE; EAPI extern const Eo_Event_Description ELM_CODE_EVENT_FILE_LOAD_DONE; @@ -36,8 +37,6 @@ typedef enum { ELM_CODE_TOKEN_TYPE_COUNT } Elm_Code_Token_Type; -#include "elm_code_file.h" - #ifdef __cplusplus extern "C" { #endif diff --git a/elm_code/lib/elm_code_file.h b/elm_code/lib/elm_code_file.h index ee177ed..2a1d082 100644 --- a/elm_code/lib/elm_code_file.h +++ b/elm_code/lib/elm_code_file.h @@ -35,7 +35,7 @@ typedef struct _Elm_Code_Line } Elm_Code_Line; -typedef struct _Elm_Code_File +struct _Elm_Code_File { void *parent; @@ -43,7 +43,7 @@ typedef struct _Elm_Code_File Eina_File *file; void *map; -} Elm_Code_File; +}; /** * @brief File handling functions. diff --git a/elm_code/lib/elm_code_widget.h b/elm_code/lib/elm_code_widget.h index 2302914..6e37440 100644 --- a/elm_code/lib/elm_code_widget.h +++ b/elm_code/lib/elm_code_widget.h @@ -2,7 +2,9 @@ # define ELM_CODE_WIDGET_H_ #include <Evas.h> + #include "elm_code_common.h" +#include "elm_code_file.h" #ifdef __cplusplus extern "C" { --
