xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/os-support/misc/Makefile.am   |    5 +----
 hw/xfree86/os-support/misc/xf86_IlHack.c |   16 ----------------
 2 files changed, 1 insertion(+), 20 deletions(-)

New commits:
commit 95bb6f53624a3e6f4d62a2f789982c5544d2fc70
Author: Mathieu Bérard <mathieu.berard at crans.org>
Date:   Mon Aug 18 11:47:19 2008 -0400

    Remove ancient unused inline hack.

diff --git a/hw/xfree86/os-support/misc/Makefile.am b/hw/xfree86/os-support/misc/Makefile.am
index ad27cfc..737328c 100644
--- a/hw/xfree86/os-support/misc/Makefile.am
+++ b/hw/xfree86/os-support/misc/Makefile.am
@@ -7,9 +7,6 @@ ARCH_SRCS = $(OTHER_SRCS)
 # FIXME: Add to the build (NeedPortIO)
 PORTIO_SRCS = PortIO.S
 
-# FIXME: Add to the build (if HasGcc || HasGcc2)
-ILHACK_SRCS = xf86_IlHack.c
-
 noinst_LTLIBRARIES = libmisc.la
 
 libmisc_la_SOURCES = Delay.c $(ARCH_SRCS)
@@ -20,4 +17,4 @@ INCLUDES = $(XORG_INCS)
 
 AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS)
 
-EXTRA_DIST = $(I386_SRCS) $(PORTIO_SRCS) $(ILHACK_SRCS)
+EXTRA_DIST = $(I386_SRCS) $(PORTIO_SRCS)
diff --git a/hw/xfree86/os-support/misc/xf86_IlHack.c b/hw/xfree86/os-support/misc/xf86_IlHack.c
deleted file mode 100644
index 6c9871d..0000000
--- a/hw/xfree86/os-support/misc/xf86_IlHack.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * This file is an incredible crock to get the normally-inline functions
- * built into the server so that things can be debugged properly.
- *
- * Note: this doesn't work when using a compiler other than GCC.
- */
-
-#define static /**/
-#define __inline__ /**/
-#undef NO_INLINE
-#define DO_PROTOTYPES
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include "compiler.h"