aboutsummaryrefslogtreecommitdiffstats
path: root/legacy/evas/src/lib/canvas/evas_main.c
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2010-01-30 00:09:29 +0000
committerVincent Torri <vincent.torri@gmail.com>2010-01-30 00:09:29 +0000
commit20d5a675db3ecb4beb65ae0188f82ab5195e53ac (patch)
tree8c8b53acfecb92cb0a626f249c1383ddddbf1f41 /legacy/evas/src/lib/canvas/evas_main.c
parent * src/lib/evil_fcntl.c: (diff)
downloadefl-20d5a675db3ecb4beb65ae0188f82ab5195e53ac.tar.gz
* undef close() and open() in evas_module also for mingw
* init Evil in eina as it uses fcntl() with the winsock2 library * fix compilation of evas_cache_image.c with mingw * formatting SVN revision: 45724
Diffstat (limited to 'legacy/evas/src/lib/canvas/evas_main.c')
-rw-r--r--legacy/evas/src/lib/canvas/evas_main.c16
1 files changed, 14 insertions, 2 deletions
diff --git a/legacy/evas/src/lib/canvas/evas_main.c b/legacy/evas/src/lib/canvas/evas_main.c
index 1507349e8a..8b18367f2a 100644
--- a/legacy/evas/src/lib/canvas/evas_main.c
+++ b/legacy/evas/src/lib/canvas/evas_main.c
@@ -21,13 +21,18 @@ evas_init(void)
if (++_evas_init_count != 1)
return _evas_init_count;
- if (!eina_init())
+#ifdef HAVE_EVIL
+ if (!evil_init())
return --_evas_init_count;
+#endif
+
+ if (!eina_init())
+ goto shutdown_evil;
_evas_log_dom_global = eina_log_domain_register("evas_main",EVAS_DEFAULT_LOG_COLOR);
if (_evas_log_dom_global < 0)
{
- EINA_LOG_ERR("Evas could not create a default log domain\n");
+ EINA_LOG_ERR("Evas could not create a default log domain\n");
goto shutdown_eina;
}
@@ -52,6 +57,10 @@ evas_init(void)
#endif
shutdown_eina:
eina_shutdown();
+ shutdown_evil:
+#ifdef HAVE_EVIL
+ evil_shutdown();
+#endif
return --_evas_init_count;
}
@@ -88,6 +97,9 @@ evas_shutdown(void)
evas_module_shutdown();
eina_log_domain_unregister(_evas_log_dom_global);
eina_shutdown();
+#ifdef HAVE_EVIL
+ evil_shutdown();
+#endif
return _evas_init_count;
}