xserver: Branch 'master' - 2 commits

[Keith Packard]

 hw/xfree86/os-support/hurd/hurd_init.c  |    1 +
 hw/xfree86/os-support/hurd/hurd_mmap.c  |    1 +
 hw/xfree86/os-support/hurd/hurd_video.c |    1 +
 os/access.c                             |    8 ++++----
 4 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit ccbe17b1c6da1ad9d085fc8133cdd15dc7004a4a
Author: Pino Toscano <toscano.pino at tiscali.it>
Date:   Wed Aug 28 17:15:03 2013 +0200

    os: move <arpa/inet.h> for any !win32 system
    
    It is needed in IPv6 configurations (for inet_pton) also when
    SIOCGIFCONF is not defined.
    
    Signed-off-by: Pino Toscano <toscano.pino at tiscali.it>
    Acked-by: Samuel Thibault <samuel.thibault at ens-lyon.org>
    Signed-off-by: Julien Cristau <jcristau at debian.org>

diff --git a/os/access.c b/os/access.c
index 88a44d9..6d991b3 100644
--- a/os/access.c
+++ b/os/access.c
@@ -163,6 +163,10 @@ SOFTWARE.
 /* #endif */
 #endif
 
+#if defined(IPv6) && defined(AF_INET6)
+#include <arpa/inet.h>
+#endif
+
 #endif                          /* WIN32 */
 
 #define X_INCLUDE_NETDB_H
@@ -461,10 +465,6 @@ DefineSelf(int fd)
 #endif
 
 #if defined(IPv6) && defined(AF_INET6)
-#include <arpa/inet.h>
-#endif
-
-#if defined(IPv6) && defined(AF_INET6)
 static void
 in6_fillscopeid(struct sockaddr_in6 *sin6)
 {
commit c079b8e675dd2762c9e07fe5d8c07612299dceb7
Author: Pino Toscano <toscano.pino at tiscali.it>
Date:   Wed Aug 28 17:04:48 2013 +0200

    xfree86/hurd: include <hurd.h>
    
    Needed for using get_privileged_port.
    
    Signed-off-by: Pino Toscano <toscano.pino at tiscali.it>
    Acked-by: Samuel Thibault <samuel.thibault at ens-lyon.org>
    Signed-off-by: Julien Cristau <jcristau at debian.org>

diff --git a/hw/xfree86/os-support/hurd/hurd_init.c b/hw/xfree86/os-support/hurd/hurd_init.c
index 185b2b9..fe1a764 100644
--- a/hw/xfree86/os-support/hurd/hurd_init.c
+++ b/hw/xfree86/os-support/hurd/hurd_init.c
@@ -42,6 +42,7 @@
 #include <sys/file.h>
 #include <assert.h>
 #include <mach.h>
+#include <hurd.h>
 
 int
 xf86ProcessArgument(int argc, char **argv, int i)
diff --git a/hw/xfree86/os-support/hurd/hurd_mmap.c b/hw/xfree86/os-support/hurd/hurd_mmap.c
index 6ac9efd..8e089ca 100644
--- a/hw/xfree86/os-support/hurd/hurd_mmap.c
+++ b/hw/xfree86/os-support/hurd/hurd_mmap.c
@@ -27,6 +27,7 @@
 #include<mach.h>
 #include<device/device.h>
 #include<mach/machine/mach_i386.h>
+#include <hurd.h>
 
 #include <X11/X.h>
 
diff --git a/hw/xfree86/os-support/hurd/hurd_video.c b/hw/xfree86/os-support/hurd/hurd_video.c
index 72474ba..b3b94c9 100644
--- a/hw/xfree86/os-support/hurd/hurd_video.c
+++ b/hw/xfree86/os-support/hurd/hurd_video.c
@@ -28,6 +28,7 @@
 #include <mach.h>
 #include <device/device.h>
 #include <mach/machine/mach_i386.h>
+#include <hurd.h>
 
 #include <X11/X.h>
 #include "input.h"