diff options
| author |  Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-15 05:07:09 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-15 05:57:31 +0200 |
| commit | 9bcd12fdf5c6f85e9bb391caa2713021624a957e (patch) | |
| tree | 375eac533ead90a45e7121e5ab307861b4ef52c8 /osdep/getch2-win.c | |
| parent | d419ecd161634e79dab3ac57d57c4bccba2adcdc (diff) | |
| parent | e0d66b140e1da7a793bff15003cadab79544b1dd (diff) | |
Merge svn changes up to r28310
The libdvdread4 and libdvdnav directories, which are externals in the
svn repository, are at least for now not included in any form. I added
configure checks to automatically disable internal libdvdread and
libdvdnav if the corresponding directories are not present; if they're
added manually then things work the same as in svn.
Diffstat (limited to 'osdep/getch2-win.c')
| -rw-r--r-- | osdep/getch2-win.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/osdep/getch2-win.c b/osdep/getch2-win.c index 49ec9c46b3..a1c5601474 100644 --- a/osdep/getch2-win.c +++ b/osdep/getch2-win.c @@ -31,7 +31,7 @@ int screen_width=80; int screen_height=24; char * erase_to_end_of_line = NULL; -void get_screen_size(){ +void get_screen_size(void){ } static HANDLE stdin; @@ -128,7 +128,8 @@ void getch2(struct mp_fifo *fifo) mplayer_put_key(fifo, r); } -void getch2_enable(){ +void getch2_enable(void) +{ DWORD retval; stdin = GetStdHandle(STD_INPUT_HANDLE); if(!GetNumberOfConsoleInputEvents(stdin,&retval)) @@ -139,7 +140,8 @@ void getch2_enable(){ else getch2_status=1; } -void getch2_disable(){ +void getch2_disable(void) +{ if(!getch2_status) return; // already disabled / never enabled getch2_status=0; } |