summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Zaoui <daniel.zaoui@samsung.com>2012-10-21 08:04:20 +0000
committerDaniel Zaoui <daniel.zaoui@yahoo.com>2012-10-21 08:04:20 +0000
commitcacd9955abdfad6a5542c7812d85ca0b237b0ae3 (patch)
tree44c0e3737aea593c91e580b640631d8eadfc619b
parented5e14204e61a183272062432f5d8205b29a349b (diff)
Fix: compilation problem due to _ecore_parent declaration and
HAVE_MALLINFO conflict. Thanks to vtorri for having found that. Signed-off-by: Daniel Zaoui <daniel.zaoui@samsung.com> SVN revision: 78301
-rw-r--r--legacy/ecore/src/lib/ecore/ecore.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/legacy/ecore/src/lib/ecore/ecore.c b/legacy/ecore/src/lib/ecore/ecore.c
index 35c548679b..e9d9453d86 100644
--- a/legacy/ecore/src/lib/ecore/ecore.c
+++ b/legacy/ecore/src/lib/ecore/ecore.c
@@ -37,8 +37,6 @@
37#include <malloc.h> 37#include <malloc.h>
38 38
39 39
40EAPI Eo *_ecore_parent = NULL;
41
42static Ecore_Version _version = { VERS_MAJ, VERS_MIN, VERS_MIC, VERS_REV }; 40static Ecore_Version _version = { VERS_MAJ, VERS_MIN, VERS_MIC, VERS_REV };
43EAPI Ecore_Version *ecore_version = &_version; 41EAPI Ecore_Version *ecore_version = &_version;
44 42
@@ -52,6 +50,8 @@ static int _ecore_memory_max_free = 0;
52static pid_t _ecore_memory_pid = 0; 50static pid_t _ecore_memory_pid = 0;
53#endif 51#endif
54 52
53EAPI Eo *_ecore_parent = NULL;
54
55static const char *_ecore_magic_string_get(Ecore_Magic m); 55static const char *_ecore_magic_string_get(Ecore_Magic m);
56static int _ecore_init_count = 0; 56static int _ecore_init_count = 0;
57int _ecore_log_dom = -1; 57int _ecore_log_dom = -1;