diff --git a/tools/dbus-echo.c b/tools/dbus-echo.c index 72973cdb..10e9dc5b 100644 --- a/tools/dbus-echo.c +++ b/tools/dbus-echo.c @@ -89,7 +89,7 @@ filter (DBusConnection *connection, if (sleep_ms > 0) { - tool_millisleep (sleep_ms); + _dbus_sleep_milliseconds (sleep_ms); } if (!noreply) diff --git a/tools/tool-common.c b/tools/tool-common.c index b1f36502..32020324 100644 --- a/tools/tool-common.c +++ b/tools/tool-common.c @@ -37,25 +37,6 @@ #include #endif -/* a hack to avoid having to depend on the static -util version of libdbus; - * it's useful for ancillary programs to be able to use the shared library */ -void -tool_millisleep (unsigned int ms) -{ -#ifdef DBUS_WIN - Sleep (ms); -#else - fd_set nothing; - struct timeval tv; - - tv.tv_sec = ms / 1000; - tv.tv_usec = (ms % 1000) * 1000; - - FD_ZERO (¬hing); - select (1, ¬hing, ¬hing, ¬hing, &tv); -#endif -} - void tool_oom (const char *doing) { diff --git a/tools/tool-common.h b/tools/tool-common.h index 8659011c..e6397ffb 100644 --- a/tools/tool-common.h +++ b/tools/tool-common.h @@ -32,7 +32,6 @@ #define VERBOSE(...) do {} while (0) #endif -void tool_millisleep (unsigned int ms); void tool_oom (const char *doing) _DBUS_GNUC_NORETURN; dbus_bool_t tool_write_all (int fd, const void *buf, size_t size);