diff --git a/.pick_status.json b/.pick_status.json
index 099b7aaab70..0f723538a8a 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1184,7 +1184,7 @@
         "description": "mesa: fix function prototype",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "ae75b59cb526eff5de906726b105e33258a283cf",
         "notes": null
diff --git a/src/mesa/main/glthread.h b/src/mesa/main/glthread.h
index 1447d686ce1..c2debd7e87e 100644
--- a/src/mesa/main/glthread.h
+++ b/src/mesa/main/glthread.h
@@ -405,7 +405,7 @@ void _mesa_glthread_unbind_uploaded_vbos(struct gl_context *ctx);
 void _mesa_glthread_PixelStorei(struct gl_context *ctx, GLenum pname,
                                 GLint param);
 
-void _mesa_InternalReleaseBufferMESA(void *buffer);
+void GLAPIENTRY _mesa_InternalReleaseBufferMESA(GLvoid *buffer);
 
 #ifdef __cplusplus
 }
diff --git a/src/mesa/main/glthread_bufferobj.c b/src/mesa/main/glthread_bufferobj.c
index 66499a9c90f..a92ca40a860 100644
--- a/src/mesa/main/glthread_bufferobj.c
+++ b/src/mesa/main/glthread_bufferobj.c
@@ -64,7 +64,7 @@ new_upload_buffer(struct gl_context *ctx, GLsizeiptr size, uint8_t **ptr)
    return obj;
 }
 
-void _mesa_InternalReleaseBufferMESA(void *buffer)
+void GLAPIENTRY _mesa_InternalReleaseBufferMESA(GLvoid *buffer)
 {
    GET_CURRENT_CONTEXT(ctx);
    struct gl_buffer_object *buf = buffer;