Attachment 6622 Details for Bug 5613 – some Linuxism fixes

[patch] some Linuxism fixes

patch-xorg-server-hurd (text/plain), 2.48 KB, created by Samuel Thibault on 2006-08-20 09:55:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Samuel Thibault

Created: 2006-08-20 09:55:11 UTC

Size: 2.48 KB

patch

obsolete

>--- xorg-server-1.1.1/configure.ac	2006-08-19 18:09:59.000000000 +0000
>+++ xorg-server-1.1.1-hurd/configure.ac	2006-08-20 02:08:51.000000000 +0000
>@@ -1456,7 +1456,15 @@
>     #    $MIEXT_SHADOW_LIB $XPSTUBS_LIB"
>     KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB"
>     KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.a'
>-    KDRIVE_OS_LIB='$(top_builddir)/hw/kdrive/linux/liblinux.a'
>+    case $host_os in
>+	*linux*)
>+	    KDRIVE_OS_LIB='$(top_builddir)/hw/kdrive/linux/liblinux.a'
>+	    AM_CONDITIONAL(KDRIVELINUX, true)
>+	    ;;
>+	*)
>+	    AM_CONDITIONAL(KDRIVELINUX, false)
>+	    ;;
>+    esac
>     KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a'
>     KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_OS_LIB $KDRIVE_PURE_LIBS $KDRIVE_STUB_LIB"
> 
>--- xorg-server-1.1.1/hw/kdrive/Makefile.am	2006-07-05 18:31:39.000000000 +0000
>+++ xorg-server-1.1.1-hurd/hw/kdrive/Makefile.am	2006-08-20 02:09:42.000000000 +0000
>@@ -15,9 +15,13 @@
> XEPHYR_SUBDIRS = ephyr
> endif
> 
>+if KDRIVELINUX
>+LINUX_SUBDIRS = linux
>+endif
>+
> SUBDIRS =			\
> 	src			\
>-	linux			\
>+	$(LINUX_SUBDIRS)	\
> 	$(XSDL_SUBDIRS)		\
> 	$(FBDEV_SUBDIRS)	\
> 	$(VESA_SUBDIRS)		\
>--- xorg-server-1.1.1/GL/glx/indirect_dispatch_swap.c	2006-07-05 18:31:36.000000000 +0000
>+++ xorg-server-1.1.1-hurd/GL/glx/indirect_dispatch_swap.c	2006-08-19 16:56:05.000000000 +0000
>@@ -28,7 +28,7 @@
> #include <X11/Xmd.h>
> #include <GL/gl.h>
> #include <GL/glxproto.h>
>-#ifdef __linux__
>+#if defined(__linux__) || defined(__GNU__)
> #include <byteswap.h>
> #elif defined(__OpenBSD__)
> #include <sys/endian.h>
>--- xorg-server-1.1.1/GL/glx/indirect_reqsize.c	2006-07-05 18:31:36.000000000 +0000
>+++ xorg-server-1.1.1-hurd/GL/glx/indirect_reqsize.c	2006-08-19 16:57:48.000000000 +0000
>@@ -31,7 +31,7 @@
> #include "indirect_size.h"
> #include "indirect_reqsize.h"
> 
>-#if defined(linux)
>+#if defined(__linux__) || defined(__GNU__)
> #  include <byteswap.h>
> #  define SWAP_32(v)  do { (v) = bswap_32(v); } while(0)
> #else
>--- xorg-server-1.1.1/GL/glx/indirect_util.c	2006-07-07 22:36:18.000000000 +0000
>+++ xorg-server-1.1.1-hurd/GL/glx/indirect_util.c	2006-08-19 16:57:51.000000000 +0000
>@@ -28,7 +28,7 @@
> #include <X11/Xmd.h>
> #include <GL/gl.h>
> #include <GL/glxproto.h>
>-#ifdef __linux__
>+#if defined(__linux__) || defined(__GNU__)
> #include <byteswap.h>
> #elif defined(__OpenBSD__)
> #include <sys/endian.h>

Actions: View | Splinter Review

Attachments on bug 5613: 4360 | 4895 | 4896 | 6622 | 6625 | 6707 | 7643 | 8150

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.