Source: xorg-server Version: 2:1.12.4-6 Severity: important Tags: patch User: debian-h...@lists.debian.org Usertags: hurd
Hi, xorg-server fails to compile on Hurd with GCC 4.8. The problem is basically similar to #701372, just happening on parts compiled only on Hurd. Attached there is a patch fixing all the issues: - os/access.c: moves the arpa/inet.h include from the defined(SIOCGIFCONF) block up in the source, so it applies for every !win32 system - hw/xfree86/os-support/hurd/hurd_init.c: - hw/xfree86/os-support/hurd/hurd_mmap.c: - hw/xfree86/os-support/hurd/hurd_video.c: include hurd.h, needed for Hurd's get_privileged_ports. The patch applies fine and work for both the version currently in sid (2:1.12.4-6) and in experimental (2:1.14.2.901-2). Thanks, -- Pino
--- a/os/access.c +++ b/os/access.c @@ -163,6 +163,10 @@ /* #endif */ #endif +#if defined(IPv6) && defined(AF_INET6) +#include <arpa/inet.h> +#endif + #endif /* WIN32 */ #define X_INCLUDE_NETDB_H @@ -461,10 +465,6 @@ #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) { --- 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) --- 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> --- 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"