summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/elm_general.h4
-rw-r--r--src/lib/elm_getting_started.h3
-rw-r--r--src/lib/elm_win.c2
3 files changed, 4 insertions, 5 deletions
diff --git a/src/lib/elm_general.h b/src/lib/elm_general.h
index 2af9d9ffa..03adee736 100644
--- a/src/lib/elm_general.h
+++ b/src/lib/elm_general.h
@@ -141,13 +141,13 @@ typedef Eina_Bool (*Elm_Event_Cb)(void *data, Evas_Object *obj, Evas
141extern EAPI double _elm_startup_time; 141extern EAPI double _elm_startup_time;
142 142
143#ifndef ELM_LIB_QUICKLAUNCH 143#ifndef ELM_LIB_QUICKLAUNCH
144#define ELM_MAIN() int main(int argc, char **argv) { int ret; _elm_startup_time = ecore_time_unix_get(); elm_init(argc, argv); ret = elm_main(argc, argv); return ret; } /**< macro to be used after the elm_main() function */ 144#define ELM_MAIN() int main(int argc, char **argv) { int ret; _elm_startup_time = ecore_time_get(); elm_init(argc, argv); ret = elm_main(argc, argv); elm_shutdown(); return ret; } /**< macro to be used after the elm_main() function */
145#else 145#else
146/** @deprecated macro to be used after the elm_main() function. 146/** @deprecated macro to be used after the elm_main() function.
147 * Do not define ELM_LIB_QUICKLAUNCH 147 * Do not define ELM_LIB_QUICKLAUNCH
148 * Compile your programs with -fpie and -pie -rdynamic instead, to generate a single binary (linkable executable). 148 * Compile your programs with -fpie and -pie -rdynamic instead, to generate a single binary (linkable executable).
149 */ 149 */
150#define ELM_MAIN() int main(int argc, char **argv) { _elm_startup_time = ecore_time_unix_get(); return elm_quicklaunch_fallback(argc, argv); } 150#define ELM_MAIN() int main(int argc, char **argv) { int ret; _elm_startup_time = ecore_time_get(); ret = elm_quicklaunch_fallback(argc, argv); elm_shutdown(); return ret; }
151#endif 151#endif
152 152
153/**************************************************************************/ 153/**************************************************************************/
diff --git a/src/lib/elm_getting_started.h b/src/lib/elm_getting_started.h
index a70f6f566..7cb325cb3 100644
--- a/src/lib/elm_getting_started.h
+++ b/src/lib/elm_getting_started.h
@@ -11,8 +11,7 @@
11 * { 11 * {
12 * // create window(s) here and do any application init 12 * // create window(s) here and do any application init
13 * elm_run(); // run main loop 13 * elm_run(); // run main loop
14 * elm_shutdown(); // after mainloop finishes running, shutdown 14* return 0; // exit 0 for exit code
15 * return 0; // exit 0 for exit code
16 * } 15 * }
17 * ELM_MAIN() 16 * ELM_MAIN()
18 * @endcode 17 * @endcode
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 25f1766eb..a5f93edaf 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -297,7 +297,7 @@ EAPI double _elm_startup_time = 0;
297static void 297static void
298_elm_win_first_frame_do(void *data, Evas *e EINA_UNUSED, void *event_info EINA_UNUSED) 298_elm_win_first_frame_do(void *data, Evas *e EINA_UNUSED, void *event_info EINA_UNUSED)
299{ 299{
300 double end = ecore_time_unix_get(); 300 double end = ecore_time_get();
301 char *first = data; 301 char *first = data;
302 302
303 switch (*first) 303 switch (*first)