Respect namespace

_ecore_loop_time -> _ecore_time_loop_time

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/ecore@52825 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c
index 3d14a47..87471c2 100644 (file)
--- a/src/lib/ecore/ecore_main.c
+++ b/src/lib/ecore/ecore_main.c
@@ -274,7 +274,7 @@ _ecore_main_gsource_prepare(GSource *source, gint *next_time)
 
    if (!ecore_idling)
      {
-         while (_ecore_timer_call(_ecore_loop_time));
+         while (_ecore_timer_call(_ecore_time_loop_time));
           _ecore_timer_cleanup();
 
          /* when idling, busy loop checking the fds only */
@@ -318,7 +318,7 @@ _ecore_main_gsource_check(GSource *source)
    ecore_fds_ready = (_ecore_main_fdh_epoll_mark_active() > 0);
    _ecore_main_fd_handlers_cleanup();
 
-   _ecore_loop_time = ecore_time_get();
+   _ecore_time_loop_time = ecore_time_get();
    _ecore_timer_enable_new();
 
    in_main_loop--;
@@ -916,7 +916,7 @@ _ecore_main_select(double timeout)
 
    ret = main_loop_select(max_fd + 1, &rfds, &wfds, &exfds, t);
 
-   _ecore_loop_time = ecore_time_get();
+   _ecore_time_loop_time = ecore_time_get();
    if (ret < 0)
      {
 #ifndef _WIN32
@@ -1148,7 +1148,7 @@ _ecore_main_loop_iterate_internal(int once_only)
 
    in_main_loop++;
    /* expire any timers */
-   while (_ecore_timer_call(_ecore_loop_time));
+   while (_ecore_timer_call(_ecore_time_loop_time));
    _ecore_timer_cleanup();
 
    /* process signals into events .... */
@@ -1158,7 +1158,7 @@ _ecore_main_loop_iterate_internal(int once_only)
         _ecore_idle_enterer_call();
        have_event = 1;
        _ecore_main_select(0.0);
-        _ecore_loop_time = ecore_time_get();
+        _ecore_time_loop_time = ecore_time_get();
         _ecore_timer_enable_new();
        goto process_events;
      }
@@ -1172,7 +1172,7 @@ _ecore_main_loop_iterate_internal(int once_only)
        if (_ecore_signal_count_get() > 0) have_signal = 1;
        if (have_signal || have_event)
           {
-             _ecore_loop_time = ecore_time_get();
+             _ecore_time_loop_time = ecore_time_get();
              _ecore_timer_enable_new();
              goto process_events;
           }
@@ -1186,7 +1186,7 @@ _ecore_main_loop_iterate_internal(int once_only)
      {
        have_event = 1;
        _ecore_main_select(0.0);
-        _ecore_loop_time = ecore_time_get();
+        _ecore_time_loop_time = ecore_time_get();
         _ecore_timer_enable_new();
        goto process_events;
      }
@@ -1194,7 +1194,7 @@ _ecore_main_loop_iterate_internal(int once_only)
      {
        _ecore_idle_enterer_call();
        in_main_loop--;
-        _ecore_loop_time = ecore_time_get();
+        _ecore_time_loop_time = ecore_time_get();
         _ecore_timer_enable_new();
        return;
      }
@@ -1210,7 +1210,7 @@ _ecore_main_loop_iterate_internal(int once_only)
    _ecore_timer_enable_new();
    if (do_quit)
      {
-        _ecore_loop_time = ecore_time_get();
+        _ecore_time_loop_time = ecore_time_get();
        in_main_loop--;
         _ecore_timer_enable_new();
        return;
@@ -1267,7 +1267,7 @@ _ecore_main_loop_iterate_internal(int once_only)
                    }
               }
          }
-        _ecore_loop_time = ecore_time_get();
+        _ecore_time_loop_time = ecore_time_get();
      }
    if (_ecore_fps_debug) t1 = ecore_time_get();
    /* we came out of our "wait state" so idle has exited */

diff --git a/src/lib/ecore/ecore_private.h b/src/lib/ecore/ecore_private.h
index 5ff4ab2..0edc183 100644 (file)
--- a/src/lib/ecore/ecore_private.h
+++ b/src/lib/ecore/ecore_private.h
@@ -202,7 +202,7 @@ void _ecore_main_loop_init(void);
 void _ecore_main_loop_shutdown(void);
 
 extern int    _ecore_fps_debug;
-extern double _ecore_loop_time;
+extern double _ecore_time_loop_time;
 extern Eina_Bool _ecore_glib_always_integrate;
 
 #endif

diff --git a/src/lib/ecore/ecore_time.c b/src/lib/ecore/ecore_time.c
index b26a390..b201a90 100644 (file)
--- a/src/lib/ecore/ecore_time.c
+++ b/src/lib/ecore/ecore_time.c
@@ -20,7 +20,7 @@
 #if HAVE_CLOCK_GETTIME
 static clockid_t _ecore_time_clock_id = -1;
 #endif
-double _ecore_loop_time = -1.0;
+double _ecore_time_loop_time = -1.0;
 
 /**
  * Retrieves the current system time as a floating point value in seconds.
@@ -53,7 +53,7 @@ ecore_time_get(void)
      {
         CRIT("Cannot get current time.");
         /* Try to at least return the latest value retrieved*/
-        return _ecore_loop_time;
+        return _ecore_time_loop_time;
      }
 
    return (double)t.tv_sec + (((double)t.tv_nsec) / 1000000000.0);
@@ -111,7 +111,7 @@ ecore_time_unix_get(void)
 EAPI double
 ecore_loop_time_get(void)
 {
-   return _ecore_loop_time;
+   return _ecore_time_loop_time;
 }
 
 
@@ -153,5 +153,5 @@ _ecore_time_init(void)
         "Fallback to unix time.");
 #endif
 
-   _ecore_loop_time = ecore_time_get();
+   _ecore_time_loop_time = ecore_time_get();
 }