xserver: Branch 'master' - 2 commits

[Daniel Stone]

 GL/glx/glxext.c               |    2 +-
 GL/glx/glxglcore.c            |    2 +-
 hw/xfree86/common/Makefile.am |    1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 641a5f955b7b3ae04eeb6bc45fb30b0b531898e4
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Wed May 7 22:29:04 2008 +0300

    Build: Ensure xf86DefModeSet.c ends in an empty line
    
    This shuts up a warning.

diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
index 0f44075..c4be599 100644
--- a/hw/xfree86/common/Makefile.am
+++ b/hw/xfree86/common/Makefile.am
@@ -25,6 +25,7 @@ MODEDEFSOURCES = $(srcdir)/vesamodes $(srcdir)/extramodes
 
 xf86DefModeSet.c: $(srcdir)/modeline2c.awk $(MODEDEFSOURCES)
 	cat $(MODEDEFSOURCES) | $(AWK) -f $(srcdir)/modeline2c.awk > $@
+	echo >> $@
 
 BUILT_SOURCES = xf86DefModeSet.c
 
commit 268d61e00cf4bc52c05f19eda7ab4f6accce12c8
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Wed May 7 22:28:45 2008 +0300

    GL: Make errors non-fatal
    
    GLX, there's more to the world than just you.  If you fail to load the
    software renderer, don't bring the entire server down.
    
    The error path probably needs better testing on this one, but it seems
    mostly okay to me.

diff --git a/GL/glx/glxext.c b/GL/glx/glxext.c
index 85d8deb..1cbc279 100644
--- a/GL/glx/glxext.c
+++ b/GL/glx/glxext.c
@@ -288,7 +288,7 @@ void GlxExtensionInit(void)
 			    __glXDispatch, ResetExtension,
 			    StandardMinorOpcode);
     if (!extEntry) {
-	FatalError("__glXExtensionInit: AddExtensions failed\n");
+	ErrorF("__glXExtensionInit: AddExtensions failed\n");
 	return;
     }
     if (!AddExtensionAlias(GLX_EXTENSION_ALIAS, extEntry)) {
diff --git a/GL/glx/glxglcore.c b/GL/glx/glxglcore.c
index dafa9bc..00279b7 100644
--- a/GL/glx/glxglcore.c
+++ b/GL/glx/glxglcore.c
@@ -510,7 +510,7 @@ handle_error:
 
     xfree(screen);
 
-    FatalError("GLX: could not load software renderer\n");
+    ErrorF("GLX: could not load software renderer\n");
 
     return NULL;
 }