X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fglx%2Fsingle2.c;h=2a1bf06bc0abcb4d3987b54369c3bbb21abaea78;hb=d4a9010338e191cb9b3f2d1c666e0b5f2275e84b;hp=103558fb5b2325013651646cf8ce54dfe19e0de3;hpb=3f0e3a7ad5cf9bef745d460b0fa5e75ff830cb32;p=mesa.git

diff --git a/src/glx/single2.c b/src/glx/single2.c
index 103558fb5b2..2a1bf06bc0a 100644
--- a/src/glx/single2.c
+++ b/src/glx/single2.c
@@ -330,7 +330,7 @@ __indirect_glGetBooleanv(GLenum val, GLboolean * b)
 
    if (compsize == 0) {
       /*
-       ** Error occured; don't modify user's buffer.
+       ** Error occurred; don't modify user's buffer.
        */
    }
    else {
@@ -381,7 +381,7 @@ __indirect_glGetDoublev(GLenum val, GLdouble * d)
 
    if (compsize == 0) {
       /*
-       ** Error occured; don't modify user's buffer.
+       ** Error occurred; don't modify user's buffer.
        */
    }
    else {
@@ -432,7 +432,7 @@ __indirect_glGetFloatv(GLenum val, GLfloat * f)
 
    if (compsize == 0) {
       /*
-       ** Error occured; don't modify user's buffer.
+       ** Error occurred; don't modify user's buffer.
        */
    }
    else {
@@ -483,7 +483,7 @@ __indirect_glGetIntegerv(GLenum val, GLint * i)
 
    if (compsize == 0) {
       /*
-       ** Error occured; don't modify user's buffer.
+       ** Error occurred; don't modify user's buffer.
        */
    }
    else {
@@ -588,7 +588,7 @@ __indirect_glRenderMode(GLenum mode)
    if (reply.newMode != mode) {
       /*
        ** Switch to new mode did not take effect, therefore an error
-       ** occured.  When an error happens the server won't send us any
+       ** occurred.  When an error happens the server won't send us any
        ** other data.
        */
    }
@@ -886,8 +886,9 @@ __indirect_glAreTexturesResident(GLsizei n, const GLuint * textures,
    GLboolean retval = (GLboolean) 0;
    if (__builtin_expect((n >= 0) && (dpy != NULL), 1)) {
       xcb_connection_t *c = XGetXCBConnection(dpy);
+      xcb_glx_are_textures_resident_reply_t *reply;
       (void) __glXFlushRenderBuffer(gc, gc->pc);
-      xcb_glx_are_textures_resident_reply_t *reply =
+      reply =
          xcb_glx_are_textures_resident_reply(c,
                                              xcb_glx_are_textures_resident
                                              (c, gc->currentContextTag, n,