summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2011-12-20 11:13:46 +0000
committerCedric BAIL <cedric.bail@free.fr>2011-12-20 11:13:46 +0000
commit29832d6e874d872ff51230b5c9a4339ed7fbfe4b (patch)
tree0bd1047bbeeeb6e1dc39773c7a57ee2712bbdd2b
parentccf958883c42d5c397ea0c0b3d82e15c6954f457 (diff)
eina: backport r66383.
SVN revision: 66385
-rw-r--r--ChangeLog4
-rw-r--r--src/lib/eina_main.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 41dc883..632a007 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,3 +31,7 @@
312011-12-07 Mike Blumenkrantz (discomfitor/zmike) 312011-12-07 Mike Blumenkrantz (discomfitor/zmike)
32 32
33 * eina_log*level_check() functions now return the correct value 33 * eina_log*level_check() functions now return the correct value
34
352011-12-20 Cedric Bail
36
37 * Fix bug on eina_shutdown when using eina_error.
diff --git a/src/lib/eina_main.c b/src/lib/eina_main.c
index 0ff5e1c..294af9e 100644
--- a/src/lib/eina_main.c
+++ b/src/lib/eina_main.c
@@ -135,6 +135,7 @@ struct eina_desc_setup
135static const struct eina_desc_setup _eina_desc_setup[] = { 135static const struct eina_desc_setup _eina_desc_setup[] = {
136#define S(x) {# x, eina_ ## x ## _init, eina_ ## x ## _shutdown} 136#define S(x) {# x, eina_ ## x ## _init, eina_ ## x ## _shutdown}
137 /* log is a special case as it needs printf */ 137 /* log is a special case as it needs printf */
138 S(stringshare),
138 S(error), 139 S(error),
139 S(safety_checks), 140 S(safety_checks),
140 S(magic_string), 141 S(magic_string),
@@ -145,7 +146,6 @@ static const struct eina_desc_setup _eina_desc_setup[] = {
145 S(mempool), 146 S(mempool),
146 S(list), 147 S(list),
147 S(binshare), 148 S(binshare),
148 S(stringshare),
149 S(ustringshare), 149 S(ustringshare),
150 S(matrixsparse), 150 S(matrixsparse),
151 S(convert), 151 S(convert),