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

[From: subversion at stage.maemo.org]

Author: makarhun
Date: 2009-04-28 08:36:09 +0300 (Tue, 28 Apr 2009)
New Revision: 18180

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

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 15:34:45 UTC (rev 18179)
+++ projects/haf/trunk/dbus/debian/patches/45-dbus-clock-monotonic-1.patch	2009-04-28 05:36:09 UTC (rev 18180)
@@ -21,7 +21,7 @@
 +pthread_condattr_t attr;
 +pthread_condattr_init (&attr);
 +pthread_condattr_setclock (&attr, CLOCK_MONOTONIC);
-+clock_getres (&monotonic_timer, CLOCK_MONOTONIC);
++clock_getres (CLOCK_MONOTONIC,&monotonic_timer);
 +], have_clock_monotonic=true, have_clock_monotonic=false)
 +if test x$have_clock_monotonic = xtrue; then
 +    AC_MSG_RESULT([found])
@@ -77,7 +77,7 @@
  
    if (result == EAGAIN || result == ENOMEM)
      {
-@@ -248,8 +265,20 @@ _dbus_pthread_condvar_wait_timeout (DBus
+@@ -248,7 +265,18 @@ _dbus_pthread_condvar_wait_timeout (DBus
    
    _dbus_assert (pmutex->count > 0);
    _dbus_assert (pthread_equal (pmutex->holder, pthread_self ()));  
@@ -87,7 +87,7 @@
 +  if (have_monotonic_clock)
 +    {
 +      struct timespec monotonic_timer;
-+      clock_getres (&monotonic_timer, CLOCK_MONOTONIC);
++      clock_gettime (CLOCK_MONOTONIC,&monotonic_timer);
 +      time_now.tv_sec = monotonic_timer.tv_sec;
 +      time_now.tv_usec = monotonic_timer.tv_nsec / 1000;
 +    }
@@ -95,11 +95,9 @@
 +    /* This else falls through to gettimeofday */
 +#endif
    gettimeofday (&time_now, NULL);
-+
    
    end_time.tv_sec = time_now.tv_sec + timeout_milliseconds / 1000;
-   end_time.tv_nsec = (time_now.tv_usec + (timeout_milliseconds % 1000) * 1000) * 1000;
-@@ -317,8 +346,19 @@ static const DBusThreadFunctions pthread
+@@ -317,8 +345,19 @@ static const DBusThreadFunctions pthread
    _dbus_pthread_mutex_unlock
  };