geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't conflict with usage of stdout as a stdio macro 

Patch inspired by http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/pkgsrc/devel/SDL2/patches/patch-src_video_wayland_SDL__waylandmessagebox.c?rev=1.1&content-type=text/plain
main
Sam Lantinga 2022-07-30 16:22:24 -07:00
parent 6e9a606a8e
commit 21100006ad
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/video/wayland/SDL_waylandmessagebox.c
View File

@ -118,7 +118,7 @@ Wayland_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid)
size_t output_len = 1; size_t output_len = 1;
char* output = NULL; char* output = NULL;
char* tmp = NULL; char* tmp = NULL;
FILE* stdout = NULL; FILE* outputfp = NULL;
close(fd_pipe[1]); /* no writing to pipe */ close(fd_pipe[1]); /* no writing to pipe */
/* At this point, if no button ID is needed, we can just bail as soon as the /* At this point, if no button ID is needed, we can just bail as soon as the
@ -146,14 +146,14 @@ Wayland_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid)
} }
output[0] = '\0'; output[0] = '\0';
stdout = fdopen(fd_pipe[0], "r"); outputfp = fdopen(fd_pipe[0], "r");
if (!stdout) { if (!outputfp) {
SDL_free(output); SDL_free(output);
close(fd_pipe[0]); close(fd_pipe[0]);
return SDL_SetError("Couldn't open pipe for reading: %s", strerror(errno)); return SDL_SetError("Couldn't open pipe for reading: %s", strerror(errno));
} }
tmp = fgets(output, output_len + 1, stdout); tmp = fgets(output, output_len + 1, outputfp);
fclose(stdout); fclose(outputfp);
if ((tmp == NULL) || (*tmp == '\0') || (*tmp == '\n')) { if ((tmp == NULL) || (*tmp == '\0') || (*tmp == '\n')) {
SDL_free(output); SDL_free(output);