|
@@ -566,8 +566,10 @@ CharDriverState *chr_baum_init(void)
|
|
BaumDriverState *baum;
|
|
BaumDriverState *baum;
|
|
CharDriverState *chr;
|
|
CharDriverState *chr;
|
|
brlapi_handle_t *handle;
|
|
brlapi_handle_t *handle;
|
|
-#if defined(CONFIG_SDL) && SDL_COMPILEDVERSION < SDL_VERSIONNUM(2, 0, 0)
|
|
|
|
|
|
+#if defined(CONFIG_SDL)
|
|
|
|
+#if SDL_COMPILEDVERSION < SDL_VERSIONNUM(2, 0, 0)
|
|
SDL_SysWMinfo info;
|
|
SDL_SysWMinfo info;
|
|
|
|
+#endif
|
|
#endif
|
|
#endif
|
|
int tty;
|
|
int tty;
|
|
|
|
|
|
@@ -595,12 +597,14 @@ CharDriverState *chr_baum_init(void)
|
|
goto fail;
|
|
goto fail;
|
|
}
|
|
}
|
|
|
|
|
|
-#if defined(CONFIG_SDL) && SDL_COMPILEDVERSION < SDL_VERSIONNUM(2, 0, 0)
|
|
|
|
|
|
+#if defined(CONFIG_SDL)
|
|
|
|
+#if SDL_COMPILEDVERSION < SDL_VERSIONNUM(2, 0, 0)
|
|
memset(&info, 0, sizeof(info));
|
|
memset(&info, 0, sizeof(info));
|
|
SDL_VERSION(&info.version);
|
|
SDL_VERSION(&info.version);
|
|
if (SDL_GetWMInfo(&info))
|
|
if (SDL_GetWMInfo(&info))
|
|
tty = info.info.x11.wmwindow;
|
|
tty = info.info.x11.wmwindow;
|
|
else
|
|
else
|
|
|
|
+#endif
|
|
#endif
|
|
#endif
|
|
tty = BRLAPI_TTY_DEFAULT;
|
|
tty = BRLAPI_TTY_DEFAULT;
|
|
|
|
|