diff options
| author | Mike Blumenkrantz <zmike@osg.samsung.com> | 2017-07-17 08:14:28 -0400 |
|---|---|---|
| committer | Mike Blumenkrantz <zmike@osg.samsung.com> | 2017-07-17 08:14:24 -0400 |
| commit | f8de1a3f887f9693a0ff680de62971e0bcfcc0e3 (patch) | |
| tree | 7b15d6645a59cefde32ae9bd14887bc659d33994 | |
| parent | 4b4b003245bc18ac19e0e8a505050148a59ccf6b (diff) | |
| download | enlightenment-f8de1a3f887f9693a0ff680de62971e0bcfcc0e3.tar.gz | |
reduce include deps for enlightenment_imc binary
| -rw-r--r-- | src/bin/e_config_data.c | 8 | ||||
| -rw-r--r-- | src/bin/e_imc_main.c | 14 | ||||
| -rw-r--r-- | src/bin/e_intl_data.c | 17 |
3 files changed, 34 insertions, 5 deletions
diff --git a/src/bin/e_config_data.c b/src/bin/e_config_data.c index 8dd90339f8..18b13689e6 100644 --- a/src/bin/e_config_data.c +++ b/src/bin/e_config_data.c @@ -1,4 +1,10 @@ -#include "e.h" +#include <Eina.h> +#include <Eet.h> +#include "e_macros.h" +#define E_TYPEDEFS +#include "e_config_data.h" +#undef E_TYPEDEFS +#include "e_config_data.h" static Eina_Hash *config_hash = NULL; diff --git a/src/bin/e_imc_main.c b/src/bin/e_imc_main.c index 8c5adc296a..cef9253adc 100644 --- a/src/bin/e_imc_main.c +++ b/src/bin/e_imc_main.c @@ -1,4 +1,14 @@ -#include "e.h" +#include <Eina.h> +#include <Eet.h> +#include <Ecore_File.h> +#include "e_macros.h" +#define E_TYPEDEFS +#include "e_config_data.h" +#include "e_intl_data.h" +#undef E_TYPEDEFS +#include "e_config_data.h" +#include "e_intl_data.h" + static void _e_help(void); @@ -181,7 +191,7 @@ main(int argc, char **argv) } e_intl_input_method_config_free(read_imc); - E_FREE(write_imc); + free(write_imc); eet_close(ef); e_intl_data_shutdown(); eet_shutdown(); diff --git a/src/bin/e_intl_data.c b/src/bin/e_intl_data.c index bd02c8110b..5580a3e22e 100644 --- a/src/bin/e_intl_data.c +++ b/src/bin/e_intl_data.c @@ -1,4 +1,17 @@ -#include "e.h" +#include <Eina.h> +#include <Eet.h> +#define E_TYPEDEFS +#include "e_config_data.h" +#include "e_intl_data.h" +#undef E_TYPEDEFS +#ifndef E_API +# define E_API +#endif +#ifndef EINTERN +# define EINTERN +#endif +#include "e_config_data.h" +#include "e_intl_data.h" /* This file is the counterpart for data storage of e_intl */ /* This only needs to be separate because the e_imc binary and other third parties @@ -69,7 +82,7 @@ e_intl_input_method_config_free(E_Input_Method_Config *imc) if (imc->ecore_imf_module) eina_stringshare_del(imc->ecore_imf_module); if (imc->e_im_exec) eina_stringshare_del(imc->e_im_exec); if (imc->e_im_setup_exec) eina_stringshare_del(imc->e_im_setup_exec); - E_FREE(imc); + free(imc); } } |