encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

x11: Move screen_w/h inside the only ifdef they are referenced in to avoid compiler warnings

This commit is contained in:
Brandon Schaefer 2017-08-21 23:44:46 -07:00
parent a6dc4ed568
commit 17453d495a
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/video/x11/SDL_x11modes.c
View File

@ -825,8 +825,6 @@ X11_GetDisplayModes(_THIS, SDL_VideoDisplay * sdl_display)
int nmodes; int nmodes;
XF86VidModeModeInfo ** modes; XF86VidModeModeInfo ** modes;
#endif #endif
int screen_w;
int screen_h;
SDL_DisplayMode mode; SDL_DisplayMode mode;
/* Unfortunately X11 requires the window to be created with the correct /* Unfortunately X11 requires the window to be created with the correct
@ -838,11 +836,14 @@ X11_GetDisplayModes(_THIS, SDL_VideoDisplay * sdl_display)
mode.format = sdl_display->current_mode.format; mode.format = sdl_display->current_mode.format;
mode.driverdata = NULL; mode.driverdata = NULL;
screen_w = DisplayWidth(display, data->screen);
screen_h = DisplayHeight(display, data->screen);
#if SDL_VIDEO_DRIVER_X11_XINERAMA #if SDL_VIDEO_DRIVER_X11_XINERAMA
if (data->use_xinerama) { if (data->use_xinerama) {
int screen_w;
int screen_h;
screen_w = DisplayWidth(display, data->screen);
screen_h = DisplayHeight(display, data->screen);
if (data->use_vidmode && !data->xinerama_info.x_org && !data->xinerama_info.y_org && if (data->use_vidmode && !data->xinerama_info.x_org && !data->xinerama_info.y_org &&
(screen_w > data->xinerama_info.width || screen_h > data->xinerama_info.height)) { (screen_w > data->xinerama_info.width || screen_h > data->xinerama_info.height)) {
SDL_DisplayModeData *modedata; SDL_DisplayModeData *modedata;