mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2026-05-05 08:48:07 +02:00
* tools/dbus-monitor.c: gettimeofday() is not available
on windows so we have to provide our own. It's taken from lgpl'd kdewin32 package. - Patches from Christian Ehrlicher
This commit is contained in:
parent
2dae3a600b
commit
3a33c8e294
2 changed files with 35 additions and 0 deletions
|
|
@ -1,3 +1,9 @@
|
|||
2006-12-31 Ralf Habacker <ralf.habacker@freenet.de>
|
||||
|
||||
* tools/dbus-monitor.c: gettimeofday() is not available
|
||||
on windows so we have to provide our own. It's taken from
|
||||
lgpl'd kdewin32 package. - Patches from Christian Ehrlicher
|
||||
|
||||
2006-12-31 Ralf Habacker <ralf.habacker@freenet.de>
|
||||
|
||||
* dbus/dbus-sysdeps-unix.c: moved _dbus_atomic_inc/dec()
|
||||
|
|
|
|||
|
|
@ -24,13 +24,42 @@
|
|||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#ifdef DBUS_WIN
|
||||
#include <winsock2.h>
|
||||
#undef interface
|
||||
#else
|
||||
#include <sys/time.h>
|
||||
#endif
|
||||
|
||||
#include <time.h>
|
||||
|
||||
#include <signal.h>
|
||||
|
||||
#include "dbus-print-message.h"
|
||||
|
||||
#ifdef DBUS_WIN
|
||||
|
||||
/* gettimeofday is not defined on windows */
|
||||
#define DBUS_SECONDS_SINCE_1601 11644473600LL
|
||||
#define DBUS_USEC_IN_SEC 1000000LL
|
||||
|
||||
static int
|
||||
gettimeofday (struct timeval *__p,
|
||||
void *__t)
|
||||
{
|
||||
union {
|
||||
unsigned long long ns100; /*time since 1 Jan 1601 in 100ns units */
|
||||
FILETIME ft;
|
||||
} now;
|
||||
|
||||
GetSystemTimeAsFileTime (&now.ft);
|
||||
__p->tv_usec = (long) ((now.ns100 / 10LL) % DBUS_USEC_IN_SEC);
|
||||
__p->tv_sec = (long)(((now.ns100 / 10LL) / DBUS_SECONDS_SINCE_1601) - DBUS_SECONDS_SINCE_1601);
|
||||
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
static DBusHandlerResult
|
||||
monitor_filter_func (DBusConnection *connection,
|
||||
DBusMessage *message,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue