[9ae8f17cfc8ba7fd8fb34b2a194ef965a3b36a40839a46eeab1350e916692ac9/wip/high-res-server-time-really-isnt-system-time: 6/7] x11: use G_USEC_PER_SEC instead of 1000*1000



commit 2504eb69254fcc38fc6bd74d3f4803ea922f39a8
Author: Ray Strode <rstrode redhat com>
Date:   Tue Jul 7 16:23:37 2020 -0400

    x11: use G_USEC_PER_SEC instead of 1000*1000
    
    This commit just changes the code to use G_USEC_PER_SEC where
    relevant for clarity.

 gdk/x11/gdkdisplay-x11.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index ac82a1c0d1f..cbde202da40 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -1312,7 +1312,7 @@ server_time_to_monotonic_time (GdkX11Display *display_x11,
 {
   if (display_x11->server_time_query_time == 0 ||
       (!display_x11->server_time_uses_monotonic_time &&
-       server_time > display_x11->server_time_query_time + 10*1000*1000)) /* 10 seconds */
+       server_time > display_x11->server_time_query_time + (10 * G_USEC_PER_SEC)))
     {
       gint64 current_server_time = gdk_x11_get_server_time (display_x11->leader_gdk_window);
       gint64 current_server_time_usec = (gint64)current_server_time * 1000;
@@ -1325,8 +1325,8 @@ server_time_to_monotonic_time (GdkX11Display *display_x11,
        * is under load and our processing of the server response is
        * delayed.
        */
-      if (current_server_time_usec > current_monotonic_time - 1000*1000 &&
-          current_server_time_usec < current_monotonic_time + 1000*1000)
+      if (current_server_time_usec > current_monotonic_time - (1 * G_USEC_PER_SEC) &&
+          current_server_time_usec < current_monotonic_time + (1 * G_USEC_PER_SEC))
         display_x11->server_time_uses_monotonic_time = TRUE;
 
       display_x11->server_time_offset = current_server_time_usec - current_monotonic_time;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]