[maemo-commits] [maemo-commits] r18177 - projects/haf/trunk/dbus/debian/patches

[From: subversion at stage.maemo.org]

Author: makarhun
Date: 2009-04-27 16:18:39 +0300 (Mon, 27 Apr 2009)
New Revision: 18177

Modified:
   projects/haf/trunk/dbus/debian/patches/45-dbus-clock-monotonic-1.patch
   projects/haf/trunk/dbus/debian/patches/series
Log:
duh

Modified: projects/haf/trunk/dbus/debian/patches/45-dbus-clock-monotonic-1.patch
===================================================================
--- projects/haf/trunk/dbus/debian/patches/45-dbus-clock-monotonic-1.patch	2009-04-27 13:05:35 UTC (rev 18176)
+++ projects/haf/trunk/dbus/debian/patches/45-dbus-clock-monotonic-1.patch	2009-04-27 13:18:39 UTC (rev 18177)
@@ -123,14 +123,15 @@
 ===================================================================
 --- dbus-1.2.12.orig/dbus/dbus-sysdeps-unix.c
 +++ dbus-1.2.12/dbus/dbus-sysdeps-unix.c
-@@ -2013,6 +2013,15 @@ void
+@@ -2013,6 +2013,16 @@ void
  _dbus_get_current_time (long *tv_sec,
                          long *tv_usec)
  {
 +#ifdef HAVE_CLOCK_MONOTONIC
 +  struct timespec monotonic_timer;
-+  clock_getres (&monotonic_timer, CLOCK_MONOTONIC);
 +
++  clock_gettime (CLOCK_MONOTONIC, &monotonic_timer);
++
 +  if (tv_sec)
 +    *tv_sec = monotonic_timer.tv_sec;
 +  if (tv_usec)
@@ -139,7 +140,7 @@
    struct timeval t;
  
    gettimeofday (&t, NULL);
-@@ -2021,6 +2030,7 @@ _dbus_get_current_time (long *tv_sec,
+@@ -2021,6 +2031,7 @@ _dbus_get_current_time (long *tv_sec,
      *tv_sec = t.tv_sec;
    if (tv_usec)
      *tv_usec = t.tv_usec;

Modified: projects/haf/trunk/dbus/debian/patches/series
===================================================================
--- projects/haf/trunk/dbus/debian/patches/series	2009-04-27 13:05:35 UTC (rev 18176)
+++ projects/haf/trunk/dbus/debian/patches/series	2009-04-27 13:18:39 UTC (rev 18177)
@@ -17,3 +17,4 @@
 32-add-oom-check-to-main.patch
 35-fixed-socket-dir.patch
 40-prevent-autolaunch.patch
+45-dbus-clock-monotonic-1.patch