From 67c6335efcf27186d60c17d34824d3320af878f3 Mon Sep 17 00:00:00 2001 From: James Ross-Gowan Date: Sun, 24 Aug 2014 20:56:24 +1000 Subject: win32: correct HANDLE type The correct type is HANDLE, not HANDLE*, though this change shouldn't affect functionality. --- osdep/io.c | 4 ++-- osdep/terminal-win.c | 4 ++-- osdep/terminal.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'osdep') diff --git a/osdep/io.c b/osdep/io.c index cc90f145d9..e0caa56f79 100644 --- a/osdep/io.c +++ b/osdep/io.c @@ -139,7 +139,7 @@ int mp_stat(const char *path, struct stat *buf) return res; } -static int mp_check_console(HANDLE *wstream) +static int mp_check_console(HANDLE wstream) { if (wstream != INVALID_HANDLE_VALUE) { unsigned int filetype = GetFileType(wstream); @@ -168,7 +168,7 @@ static int mp_vfprintf(FILE *stream, const char *format, va_list args) { int done = 0; - HANDLE *wstream = INVALID_HANDLE_VALUE; + HANDLE wstream = INVALID_HANDLE_VALUE; if (stream == stdout || stream == stderr) { wstream = GetStdHandle(stream == stdout ? diff --git a/osdep/terminal-win.c b/osdep/terminal-win.c index 22751b31f8..03730ae736 100644 --- a/osdep/terminal-win.c +++ b/osdep/terminal-win.c @@ -167,7 +167,7 @@ bool terminal_in_background(void) return false; } -static void write_console_text(HANDLE *wstream, char *buf) +static void write_console_text(HANDLE wstream, char *buf) { wchar_t *out = mp_from_utf8(NULL, buf); size_t out_len = wcslen(out); @@ -176,7 +176,7 @@ static void write_console_text(HANDLE *wstream, char *buf) } // Mutates the input argument (buf), because we're evil. -void mp_write_console_ansi(HANDLE *wstream, char *buf) +void mp_write_console_ansi(HANDLE wstream, char *buf) { while (*buf) { char *next = strchr(buf, '\033'); diff --git a/osdep/terminal.h b/osdep/terminal.h index dea92ba6d3..b2336b68a8 100644 --- a/osdep/terminal.h +++ b/osdep/terminal.h @@ -48,6 +48,6 @@ void terminal_get_size(int *w, int *h); void getch2_poll(void); // Windows only. -void mp_write_console_ansi(void **wstream, char *buf); +void mp_write_console_ansi(void *wstream, char *buf); #endif /* MPLAYER_GETCH2_H */ -- cgit v1.2.3