xserver: Branch 'xorg-server-1.4-apple'

[George Peter Staplin]

 hw/xquartz/GL/capabilities.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit fe35a3639081dc78ac6cc4123cde37770f6a39fd
Author: George Peter Staplin <gps at Georges-Workstation.local>
Date:   Fri Oct 24 19:12:05 2008 -0600

    XQuartz: GL: Fix several error handling mistakes in handleRenderDescriptions, that were leftover before the final code evolved.

diff --git a/hw/xquartz/GL/capabilities.c b/hw/xquartz/GL/capabilities.c
index 8101e49..b38dba8 100644
--- a/hw/xquartz/GL/capabilities.c
+++ b/hw/xquartz/GL/capabilities.c
@@ -285,7 +285,7 @@ static void handleAccumulationModes(struct glCapabilitiesConfig *c, GLint cmodes
     assert(c->total_accum_buffers < GLCAPS_COLOR_BUFFERS);
 }
 
-/* Return true if an error occured. */
+/* Return non-zero if an error occured. */
 static CGLError handleRendererDescriptions(CGLRendererInfoObj info, GLint r, 
 					   struct glCapabilitiesConfig *c) {
     CGLError err;
@@ -328,14 +328,14 @@ static CGLError handleRendererDescriptions(CGLRendererInfoObj info, GLint r,
     err = CGLDescribeRenderer(info, r, kCGLRPColorModes, &flags);
 
     if(err)
-	return true;
+	return err;
     
     handleColorModes(c, flags);
 
     err = CGLDescribeRenderer(info, r, kCGLRPAccumModes, &flags);
 
     if(err)
-	return true;
+	return err;
 
     handleAccumulationModes(c, flags);