From c3f3a701c2519d263c13a173aae6e1b18d827849 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sat, 12 Feb 2011 12:04:00 -0800 Subject: [PATCH] changeset: 5272:cb08ef104ac4 tag: tip user: Martin Decky date: Sat Feb 12 20:53:06 2011 +0100 summary: improve header files compatibility with SDL 1.2 applications (namely QEMU) --- include/SDL_hints.h | 2 +- include/SDL_video.h | 10 ---------- src/video/SDL_sysvideo.h | 3 +++ 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/include/SDL_hints.h b/include/SDL_hints.h index 60904a30c..8fa6fb2d5 100644 --- a/include/SDL_hints.h +++ b/include/SDL_hints.h @@ -154,7 +154,7 @@ extern DECLSPEC const char * SDLCALL SDL_GetHint(const char *name); * * This function is called during SDL_Quit() to free stored hints. */ -extern DECLSPEC void SDLCALL SDL_ClearHints(); +extern DECLSPEC void SDLCALL SDL_ClearHints(void); /* Ends C function definitions when using C++ */ diff --git a/include/SDL_video.h b/include/SDL_video.h index 7bf5c2ec8..8868b638a 100644 --- a/include/SDL_video.h +++ b/include/SDL_video.h @@ -602,16 +602,6 @@ extern DECLSPEC void SDLCALL SDL_SetWindowGrab(SDL_Window * window, */ extern DECLSPEC int SDLCALL SDL_GetWindowGrab(SDL_Window * window); -/** - * \brief Get driver specific information about a window. - * - * \note Include SDL_syswm.h for the declaration of SDL_SysWMinfo. - */ -struct SDL_SysWMinfo; -extern DECLSPEC SDL_bool SDLCALL SDL_GetWindowWMInfo(SDL_Window * window, - struct SDL_SysWMinfo - *info); - /** * \brief Destroy a window. */ diff --git a/src/video/SDL_sysvideo.h b/src/video/SDL_sysvideo.h index 09ab6232f..ae947d840 100644 --- a/src/video/SDL_sysvideo.h +++ b/src/video/SDL_sysvideo.h @@ -114,6 +114,9 @@ struct SDL_VideoDisplay void *driverdata; }; +/* Forward declaration */ +struct SDL_SysWMinfo; + /* Define the SDL video driver structure */ #define _THIS SDL_VideoDevice *_this