Fixed ABI, don't change the return type of SDL_GL_SwapWindow()
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58
diff --git a/include/SDL_video.h b/include/SDL_video.h
index d116ef6..402ff1c 100644
--- a/include/SDL_video.h
+++ b/include/SDL_video.h
@@ -1195,7 +1195,7 @@ extern DECLSPEC int SDLCALL SDL_GL_GetSwapInterval(void);
* \brief Swap the OpenGL buffers for a window, if double-buffering is
* supported.
*/
-extern DECLSPEC int SDLCALL SDL_GL_SwapWindow(SDL_Window * window);
+extern DECLSPEC void SDLCALL SDL_GL_SwapWindow(SDL_Window * window);
/**
* \brief Delete an OpenGL context.
diff --git a/src/dynapi/SDL_dynapi_procs.h b/src/dynapi/SDL_dynapi_procs.h
index 132d8c2..ea1f6b2 100644
--- a/src/dynapi/SDL_dynapi_procs.h
+++ b/src/dynapi/SDL_dynapi_procs.h
@@ -595,7 +595,7 @@ SDL_DYNAPI_PROC(SDL_GLContext,SDL_GL_GetCurrentContext,(void),(),return)
SDL_DYNAPI_PROC(void,SDL_GL_GetDrawableSize,(SDL_Window *a, int *b, int *c),(a,b,c),)
SDL_DYNAPI_PROC(int,SDL_GL_SetSwapInterval,(int a),(a),return)
SDL_DYNAPI_PROC(int,SDL_GL_GetSwapInterval,(void),(),return)
-SDL_DYNAPI_PROC(int,SDL_GL_SwapWindow,(SDL_Window *a),(a),return)
+SDL_DYNAPI_PROC(void,SDL_GL_SwapWindow,(SDL_Window *a),(a),return)
SDL_DYNAPI_PROC(void,SDL_GL_DeleteContext,(SDL_GLContext a),(a),)
SDL_DYNAPI_PROC(int,SDL_vsscanf,(const char *a, const char *b, va_list c),(a,b,c),return)
SDL_DYNAPI_PROC(int,SDL_GameControllerAddMappingsFromRW,(SDL_RWops *a, int b),(a,b),return)
diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
index 230a3f4..508aed9 100644
--- a/src/video/SDL_video.c
+++ b/src/video/SDL_video.c
@@ -3390,20 +3390,22 @@ SDL_GL_GetSwapInterval(void)
}
}
-int
+void
SDL_GL_SwapWindow(SDL_Window * window)
{
- CHECK_WINDOW_MAGIC(window,-1);
+ CHECK_WINDOW_MAGIC(window,);
if (!(window->flags & SDL_WINDOW_OPENGL)) {
- return SDL_SetError("The specified window isn't an OpenGL window");
+ SDL_SetError("The specified window isn't an OpenGL window");
+ return;
}
if (SDL_GL_GetCurrentWindow() != window) {
- return SDL_SetError("The specified window has not been made current");
+ SDL_SetError("The specified window has not been made current");
+ return;
}
- return _this->GL_SwapWindow(_this, window);
+ _this->GL_SwapWindow(_this, window);
}
void