From 43b944a0a6ea48e8a8b06ae3e638299f591cde8d Mon Sep 17 00:00:00 2001
From: Havoc Pennington <hp@redhat.com>
Date: Fri, 15 Jun 2007 19:28:36 +0000
Subject: 2007-06-15  Havoc Pennington  <hp@redhat.com>

	* dbus/dbus-sysdeps.c (_dbus_set_errno_to_zero)
	(_dbus_get_is_errno_nonzero, _dbus_get_is_errno_eintr)
	(_dbus_strerror_from_errno): family of functions to abstract
	errno, though these are somewhat bogus (really we should make our
	socket wrappers not use errno probably - the issue is that any
	usage of errno that isn't socket-related probably is not
	cross-platform, so should either be in a unix-only file that can
	use errno directly, or is a bug - these general errno wrappers
	hide issues of this nature in non-socket code, while
	socket-specific API changes would not since sockets are allowed
	cross-platform)
---
 bus/activation.c           | 2 ++
 bus/config-loader-libxml.c | 2 ++
 bus/dir-watch-dnotify.c    | 3 +++
 bus/dir-watch-kqueue.c     | 4 ++++
 bus/main.c                 | 5 ++---
 bus/selinux.c              | 2 ++
 6 files changed, 15 insertions(+), 3 deletions(-)

(limited to 'bus')

diff --git a/bus/activation.c b/bus/activation.c
index 2e9dadb3..2d463c36 100644
--- a/bus/activation.c
+++ b/bus/activation.c
@@ -34,7 +34,9 @@
 #include <dbus/dbus-spawn.h>
 #include <dbus/dbus-timeout.h>
 #include <dbus/dbus-sysdeps.h>
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
 
 #define DBUS_SERVICE_SECTION "D-BUS Service"
 #define DBUS_SERVICE_NAME "Name"
diff --git a/bus/config-loader-libxml.c b/bus/config-loader-libxml.c
index d9892d1b..3aa472ba 100644
--- a/bus/config-loader-libxml.c
+++ b/bus/config-loader-libxml.c
@@ -27,7 +27,9 @@
 #include <libxml/parser.h>
 #include <libxml/globals.h>
 #include <libxml/xmlmemory.h>
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
 #include <string.h>
 
 /* About the error handling: 
diff --git a/bus/dir-watch-dnotify.c b/bus/dir-watch-dnotify.c
index 988ef384..72d2ad40 100644
--- a/bus/dir-watch-dnotify.c
+++ b/bus/dir-watch-dnotify.c
@@ -27,6 +27,9 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
+#ifdef HAVE_ERRNO_H
+#include <errno.h>
+#endif
 
 #include <dbus/dbus-internals.h>
 #include "dir-watch.h"
diff --git a/bus/dir-watch-kqueue.c b/bus/dir-watch-kqueue.c
index 52f00102..171b7a82 100644
--- a/bus/dir-watch-kqueue.c
+++ b/bus/dir-watch-kqueue.c
@@ -29,6 +29,10 @@
 #include <signal.h>
 #include <fcntl.h>
 #include <unistd.h>
+#ifdef HAVE_ERRNO_H
+#include <errno.h>
+#endif
+
 #include "bus.h"
 #include <dbus/dbus-watch.h>
 
diff --git a/bus/main.c b/bus/main.c
index 421bd8bf..f33ac2a3 100644
--- a/bus/main.c
+++ b/bus/main.c
@@ -24,14 +24,13 @@
 #include "driver.h"
 #include <dbus/dbus-internals.h>
 #include <dbus/dbus-watch.h>
-#ifdef DBUS_WIN
-#include <dbus/dbus-sysdeps-win.h>
-#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <signal.h>
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
 #include "selinux.h"
 
 static BusContext *context;
diff --git a/bus/selinux.c b/bus/selinux.c
index a37e367a..34fc3cc7 100644
--- a/bus/selinux.c
+++ b/bus/selinux.c
@@ -31,7 +31,9 @@
 #ifdef HAVE_SELINUX
 #include <sys/types.h>
 #include <unistd.h>
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
 #include <pthread.h>
 #include <syslog.h>
 #include <selinux/selinux.h>
-- 
cgit