Put quotes around the CC and CXX variables passed to mklib. This make

[mesa.git] / src / glx / x11 / pixel.c

diff --git a/src/glx/x11/pixel.c b/src/glx/x11/pixel.c
index 75960e40f5591c882c37895240d94da1a622240a..3b3a1811abb9d84a26cb31c4c0aab238d02be71b 100644 (file)
--- a/src/glx/x11/pixel.c
+++ b/src/glx/x11/pixel.c
@@ -249,31 +249,12 @@ void __glFillImage(__GLXcontext *gc, GLint dim, GLint width, GLint height,
 
     /* Setup store modes that describe what we just did */
     if (modes) {
-       if (dim == 3) {
-           GLubyte *pc = modes;
-           __GLX_PUT_CHAR(0,GL_FALSE);
-           __GLX_PUT_CHAR(1,GL_FALSE);
-           __GLX_PUT_CHAR(2,0);
-           __GLX_PUT_CHAR(3,0);
-           __GLX_PUT_LONG(4,0);
-           __GLX_PUT_LONG(8,0);
-           __GLX_PUT_LONG(12,0);
-           __GLX_PUT_LONG(16,0);
-           __GLX_PUT_LONG(20,0);
-           __GLX_PUT_LONG(24,0);
-           __GLX_PUT_LONG(28,0);
-           __GLX_PUT_LONG(32,1);
-       } else {
-           GLubyte *pc = modes;
-           __GLX_PUT_CHAR(0,GL_FALSE);
-           __GLX_PUT_CHAR(1,GL_FALSE);
-           __GLX_PUT_CHAR(2,0);
-           __GLX_PUT_CHAR(3,0);
-           __GLX_PUT_LONG(4,0);
-           __GLX_PUT_LONG(8,0);
-           __GLX_PUT_LONG(12,0);
-           __GLX_PUT_LONG(16,1);
-       }
+       if ( dim < 3 ) {
+         (void) memcpy( modes, __glXDefaultPixelStore + 4, 20 );
+       }
+       else {
+         (void) memcpy( modes, __glXDefaultPixelStore + 0, 36 );
+       }
     }
 }