eina: backport r66383.

SVN revision: 66385

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 @@
 2011-12-07  Mike Blumenkrantz (discomfitor/zmike)
 
         * eina_log*level_check() functions now return the correct value
+
+2011-12-20  Cedric Bail
+
+	* 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
 static const struct eina_desc_setup _eina_desc_setup[] = {
 #define S(x) {# x, eina_ ## x ## _init, eina_ ## x ## _shutdown}
    /* log is a special case as it needs printf */
+   S(stringshare),
    S(error),
    S(safety_checks),
    S(magic_string),
@@ -145,7 +146,6 @@ static const struct eina_desc_setup _eina_desc_setup[] = {
    S(mempool),
    S(list),
    S(binshare),
-   S(stringshare),
    S(ustringshare),
    S(matrixsparse),
    S(convert),