xserver: Branch 'master'

[Eric Anholt]

 hw/xfree86/loader/os.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

New commits:
diff-tree bc6cfde19887eff7a07dc739ffa29609fb55b83d (from c7ac485a59709572307b9a4a9abacc52c7021b65)
Author: Eric Anholt <anholt at FreeBSD.org>
Date:   Fri Jun 23 20:07:34 2006 -0700

    Use correct OSNAME setting so we can find os-specific modules like libdrm.

diff --git a/hw/xfree86/loader/os.c b/hw/xfree86/loader/os.c
index 42ab0bc..83fd247 100644
--- a/hw/xfree86/loader/os.c
+++ b/hw/xfree86/loader/os.c
@@ -33,10 +33,11 @@
 
 /*
  * OSNAME is a standard form of the OS name that may be used by the
- * loader and by OS-specific modules.
+ * loader and by OS-specific modules.  OSNAME here is different from what's in
+ * dix-config.h
  */
 
-#ifndef OSNAME
+#undef OSNAME
 #if defined(__linux__)
 #define OSNAME "linux"
 #elif defined(__FreeBSD__)
@@ -66,7 +67,6 @@
 #else
 #define OSNAME "unknown"
 #endif
-#endif
 
 /* Return the OS name, and run-time OS version */