[PATCHES] fix build on GNU/Hurd with GCC 4.8
Samuel Thibault
samuel.thibault at ens-lyon.org
Tue Sep 17 11:02:15 PDT 2013
Hello,
Pino Toscano, le Wed 28 Aug 2013 17:36:26 +0200, a écrit :
> with GCC 4.8, few "implicit declaration of function" warnings become
> errors, breaking the build of xserver on the Hurd.
>
> Attached there are two patches, which apply fine in both master and
> server-1.14-branch branches, which fix the errors providing the right
> includes:
> * the inclusion of <hurd.h> in Hurd parts should be straightforward
> * the move of the <arpa/inet.h> (which is POSIX) to a move general
> location affects any other Unix system with IPv6 support, I hope it is
> not a problem for all the supported platforms
Acked-by: Samuel Thibault <samuel.thibault at ens-lyon.org>
Could somebody push that to the server? We really need it.
Thanks,
Samuel
>From ef6a236cf9b795017c9c8c4447a6735fa04bb061 Mon Sep 17 00:00:00 2001
From: Pino Toscano <toscano.pino at tiscali.it>
Date: Wed, 28 Aug 2013 17:04:48 +0200
Subject: [PATCH] xfree86/hurd: include <hurd.h>
Needed for using get_privileged_port.
Signed-off-by: Pino Toscano <toscano.pino at tiscali.it>
---
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 +
3 files changed, 3 insertions(+)
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"
--
1.7.10.4
>From 006b123a801afab44a9e1a3d6e2ff5e1c6415362 Mon Sep 17 00:00:00 2001
From: Pino Toscano <toscano.pino at tiscali.it>
Date: Wed, 28 Aug 2013 17:15:03 +0200
Subject: [PATCH] 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>
---
os/access.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
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)
{
--
1.7.10.4
More information about the xorg-devel
mailing list