From b6c0ef02594d1ddc11fa8fa6af67444b826b1870 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Tue, 28 Apr 2015 20:11:27 +0200 Subject: [PATCH] tools: MSVC compile fixes unistd.h and sleep() are normally Unix-specific, although mingw also provides them. The Windows C runtime documents _environ as its equivalent of Unix environ. https://bugs.freedesktop.org/show_bug.cgi?id=90089 --- tools/dbus-echo.c | 4 +++- tools/dbus-update-activation-environment.c | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/dbus-echo.c b/tools/dbus-echo.c index 689c1b8..0e7de1b 100644 --- a/tools/dbus-echo.c +++ b/tools/dbus-echo.c @@ -26,7 +26,9 @@ #include #include #include +#ifdef HAVE_UNISTD_H #include +#endif #include @@ -231,7 +233,7 @@ dbus_test_tool_black_hole (int argc, char **argv) if (noread) { while (1) - sleep (3600); + _dbus_sleep_milliseconds (3600); } noreply = TRUE; diff --git a/tools/dbus-update-activation-environment.c b/tools/dbus-update-activation-environment.c index 56d3b20..6c53d8e 100644 --- a/tools/dbus-update-activation-environment.c +++ b/tools/dbus-update-activation-environment.c @@ -59,8 +59,14 @@ # define EX_OSERR 71 #endif -/* apparently this is the portable way to get the entire environment... */ +#ifdef DBUS_WIN +/* The Windows C runtime uses a different name */ +#define environ _environ +#else +/* apparently this is the portable way to get the entire environment... + * GNU platforms also put it in unistd.h but that's not portable */ extern char **environ; +#endif /* we don't really have anything useful to say about the stage at which we * failed */ -- 1.8.4.5