enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

Put everything in edje_private. It should fix a compilation 

bug on Windows

SVN revision: 52736
This commit is contained in:
Vincent Torri 2010-09-25 17:10:33 +00:00
parent 9e7bc3f53e
commit 1e1bb3b6a4
20 changed files with 34 additions and 274 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
legacy/edje/src/lib/edje_cache.c
View File

@ -1,27 +1,3 @@
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#ifdef HAVE_ALLOCA_H
# include <alloca.h>
#elif defined __GNUC__
# define alloca __builtin_alloca
#elif defined _AIX
# define alloca __alloca
#elif defined _MSC_VER
# include <malloc.h>
# define alloca _alloca
#else
# include <stddef.h>
# ifdef __cplusplus
extern "C"
# endif
void *alloca (size_t);
#endif
#include <string.h>
#include <sys/stat.h>
#include "edje_private.h"

3
legacy/edje/src/lib/edje_calc.c
View File

@ -1,6 +1,3 @@
#include <string.h>
#include <math.h>
#include "edje_private.h"
#define FLAG_NONE 0

21
legacy/edje/src/lib/edje_edit.c
View File

@ -7,27 +7,6 @@
*
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <string.h>
#include <limits.h>
#include <sys/stat.h>
#include <errno.h>
#ifndef _MSC_VER
# include <unistd.h>
#endif
#ifdef HAVE_LOCALE_H
# include <locale.h>
#endif
#ifdef HAVE_EVIL
# include <Evil.h>
#endif
#include "edje_private.h"
#define EDJE_EDIT_IS_UNSTABLE_AND_I_KNOW_ABOUT_IT

23
legacy/edje/src/lib/edje_embryo.c
View File

@ -1,26 +1,3 @@
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <string.h>
#ifdef HAVE_ALLOCA_H
# include <alloca.h>
#elif defined __GNUC__
# define alloca __builtin_alloca
#elif defined _AIX
# define alloca __alloca
#elif defined _MSC_VER
# include <malloc.h>
# define alloca _alloca
#else
# include <stddef.h>
# ifdef __cplusplus
extern "C"
# endif
void *alloca (size_t);
#endif
#include "edje_private.h"
/*

24
legacy/edje/src/lib/edje_entry.c
View File

@ -1,30 +1,6 @@
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <string.h>
#ifdef HAVE_ALLOCA_H
# include <alloca.h>
#elif defined __GNUC__
# define alloca __builtin_alloca
#elif defined _AIX
# define alloca __alloca
#elif defined _MSC_VER
# include <malloc.h>
# define alloca _alloca
#else
# include <stddef.h>
# ifdef __cplusplus
extern "C"
# endif
void *alloca (size_t);
#endif
#include "edje_private.h"
#ifdef HAVE_ECORE_IMF
#include <Ecore_IMF_Evas.h>
static int _edje_entry_imf_retrieve_surrounding_cb(void *data, Ecore_IMF_Context *ctx, char **text, int *cursor_pos);
static Eina_Bool _edje_entry_imf_event_commit_cb(void *data, int type, void *event);

2
legacy/edje/src/lib/edje_load.c
View File

@ -1,5 +1,3 @@
#include <string.h>
#include "edje_private.h"
#ifdef EDJE_PROGRAM_CACHE

23
legacy/edje/src/lib/edje_lua.c
View File

@ -1,26 +1,3 @@
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <string.h>
#ifdef HAVE_ALLOCA_H
# include <alloca.h>
#elif defined __GNUC__
# define alloca __builtin_alloca
#elif defined _AIX
# define alloca __alloca
#elif defined _MSC_VER
# include <malloc.h>
# define alloca _alloca
#else
# include <stddef.h>
# ifdef __cplusplus
extern "C"
# endif
void *alloca(size_t);
#endif
#include "edje_private.h"
#if 0

22
legacy/edje/src/lib/edje_lua2.c
View File

@ -158,28 +158,6 @@
* @endcode
*
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <string.h>
#ifdef HAVE_ALLOCA_H
# include <alloca.h>
#elif defined __GNUC__
# define alloca __builtin_alloca
#elif defined _AIX
# define alloca __alloca
#elif defined _MSC_VER
# include <malloc.h>
# define alloca _alloca
#else
# include <stddef.h>
# ifdef __cplusplus
extern "C"
# endif
void *alloca(size_t);
#endif
#include "edje_private.h"

21
legacy/edje/src/lib/edje_lua_script_only.c
View File

@ -1,24 +1,3 @@
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#ifdef HAVE_ALLOCA_H
# include <alloca.h>
#elif defined __GNUC__
# define alloca __builtin_alloca
#elif defined _AIX
# define alloca __alloca
#elif defined _MSC_VER
# include <malloc.h>
# define alloca _alloca
#else
# include <stddef.h>
# ifdef __cplusplus
extern "C"
# endif
void *alloca(size_t);
#endif
#include "edje_private.h"
Eina_Bool

2
legacy/edje/src/lib/edje_main.c
View File

@ -1,5 +1,3 @@
#include <time.h>
#include "edje_private.h"
static Edje_Version _version = { VMAJ, VMIN, VMIC, VREV };

2
legacy/edje/src/lib/edje_match.c
View File

@ -1,5 +1,3 @@
#include <string.h>
#include "edje_private.h"
/* States manipulations. */

2
legacy/edje/src/lib/edje_message_queue.c
View File

@ -1,5 +1,3 @@
#include <string.h>
#include "edje_private.h"
static int _injob = 0;

34
legacy/edje/src/lib/edje_module.c
View File

@ -1,37 +1,3 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#ifdef HAVE_ALLOCA_H
# include <alloca.h>
#elif defined __GNUC__
# define alloca __builtin_alloca
#elif defined _AIX
# define alloca __alloca
#elif defined _MSC_VER
# include <malloc.h>
# define alloca _alloca
#else
# include <stddef.h>
# ifdef __cplusplus
extern "C"
# endif
void *alloca (size_t);
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <libgen.h>
#ifdef HAVE_EVIL
# include <Evil.h>
#endif
#include <Eina.h>
#include <Ecore_File.h>
#include "Edje.h"
#include "edje_private.h"
Eina_Hash *_registered_modules = NULL;

48
legacy/edje/src/lib/edje_private.h
View File

@ -5,6 +5,10 @@
# include <config.h>
#endif
#ifndef _WIN32
# define _GNU_SOURCE
#endif
#ifdef HAVE_ALLOCA_H
# include <alloca.h>
#elif defined __GNUC__
@ -19,28 +23,44 @@
void *alloca (size_t);
#endif
#ifdef HAVE_EVIL
# include <Evil.h>
#endif
#include <Eina.h>
#include <Evas.h>
#include <Ecore.h>
#ifdef HAVE_ECORE_IMF
# include <Ecore_IMF.h>
#endif
#include <Eet.h>
#include <Embryo.h>
#include <string.h>
#include <limits.h>
#include <sys/stat.h>
#include <time.h>
#include <sys/time.h>
#include "Edje.h"
#include <errno.h>
#include <libgen.h>
#include <lua.h>
#include <lualib.h>
#include <lauxlib.h>
#include <setjmp.h>
#ifndef _MSC_VER
# include <unistd.h>
#endif
#ifdef HAVE_LOCALE_H
# include <locale.h>
#endif
#ifdef HAVE_EVIL
# include <Evil.h>
#endif
#include <Eina.h>
#include <Eet.h>
#include <Evas.h>
#include <Ecore.h>
#include <Ecore_File.h>
#ifdef HAVE_ECORE_IMF
# include <Ecore_IMF.h>
# include <Ecore_IMF_Evas.h>
#endif
#include <Embryo.h>
#include "Edje.h"
EAPI extern int _edje_default_log_dom ;
#ifdef EDJE_DEFAULT_LOG_COLOR

27
legacy/edje/src/lib/edje_program.c
View File

@ -1,30 +1,3 @@
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#ifndef _WIN32
# define _GNU_SOURCE
#endif
#ifdef HAVE_ALLOCA_H
# include <alloca.h>
#elif defined __GNUC__
# define alloca __builtin_alloca
#elif defined _AIX
# define alloca __alloca
#elif defined _MSC_VER
# include <malloc.h>
# define alloca _alloca
#else
# include <stddef.h>
# ifdef __cplusplus
extern "C"
# endif
void *alloca (size_t);
#endif
#include <string.h>
#include "edje_private.h"
static void _edje_emit_cb(Edje *ed, const char *sig, const char *src);

21
legacy/edje/src/lib/edje_script_only.c
View File

@ -1,24 +1,3 @@
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#ifdef HAVE_ALLOCA_H
# include <alloca.h>
#elif defined __GNUC__
# define alloca __builtin_alloca
#elif defined _AIX
# define alloca __alloca
#elif defined _MSC_VER
# include <malloc.h>
# define alloca _alloca
#else
# include <stddef.h>
# ifdef __cplusplus
extern "C"
# endif
void *alloca(size_t);
#endif
#include "edje_private.h"
/*

2
legacy/edje/src/lib/edje_text.c
View File

@ -1,5 +1,3 @@
#include <string.h>
#include "edje_private.h"

2
legacy/edje/src/lib/edje_textblock_styles.c
View File

@ -1,5 +1,3 @@
#include <string.h>
#include "edje_private.h"
static int

3
legacy/edje/src/lib/edje_util.c
View File

@ -1,6 +1,3 @@
#include <string.h>
#include <ctype.h>
#include "edje_private.h"
typedef struct _Edje_Box_Layout Edje_Box_Layout;

2
legacy/edje/src/lib/edje_var.c
View File

@ -1,5 +1,3 @@
#include <string.h>
#include "edje_private.h"
static Eina_Bool _edje_var_timer_cb(void *data);