xserver: Branch 'master'

[Alan Coopersmith]

 hw/xfree86/loader/loader.c |    5 -----
 hw/xfree86/loader/loader.h |    3 ---
 2 files changed, 8 deletions(-)

New commits:
commit 058100fd19ed33a3100d18a9ca56fdcffac361b2
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Thu Jul 17 09:35:30 2008 -0700

    Remove more Lynx leftovers
    
    A couple #if defined(Lynx) && defined(sun) had become just if defined(sun),
    resulting in wrong settings for Solaris builds, so they're now just deleted.

diff --git a/hw/xfree86/loader/loader.c b/hw/xfree86/loader/loader.c
index 96d2041..a5e8912 100644
--- a/hw/xfree86/loader/loader.c
+++ b/hw/xfree86/loader/loader.c
@@ -76,11 +76,6 @@
 #include "compiler.h"
 #include "sym.h"
 
-#if defined(sun)
-/* Cross build machine doesn;t have strerror() */
-#define strerror(err) "strerror unsupported"
-#endif
-
 /*
  * handles are used to identify files that are loaded. Even archives
  * are counted as a single file.
diff --git a/hw/xfree86/loader/loader.h b/hw/xfree86/loader/loader.h
index 882dcab..ac5f99c 100644
--- a/hw/xfree86/loader/loader.h
+++ b/hw/xfree86/loader/loader.h
@@ -53,9 +53,6 @@
 #ifndef _LOADER_H
 #define _LOADER_H
 
-#if defined(sun)
-#define const /**/
-#endif
 #include <X11/Xosdefs.h>
 #include <X11/Xfuncproto.h>
 #include <X11/Xmd.h>