diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-04 01:55:52 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-04 01:55:52 +0200 |
| commit | 8c144171bb80dd3d1f7161b97675e78cad00bc65 (patch) | |
| tree | 7ad930ebc554ab68af1911f4dfd217cc18b86cce /osdep/getch2.c | |
| parent | 52ee93c1c64dfaa0afc881c38154b04c100cb617 (diff) | |
| parent | 8c5889004f7ba9f6fcbca20a05a9301771348408 (diff) | |
| download | mpv-8c144171bb80dd3d1f7161b97675e78cad00bc65.tar.bz2 mpv-8c144171bb80dd3d1f7161b97675e78cad00bc65.tar.xz | |
Merge svn changes up to r28087
Conflicts:
command.c
libao2/ao_ivtv.c
libao2/ao_v4l2.c
libmpcodecs/dec_video.h
libvo/aspect.h
libvo/sub.c
libvo/sub.h
libvo/vo_directx.c
libvo/vo_macosx.m
libvo/vo_quartz.c
mp_core.h
mplayer.c
mplayer.h
osdep/getch2.h
osdep/timer.h
Diffstat (limited to 'osdep/getch2.c')
| -rw-r--r-- | osdep/getch2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/osdep/getch2.c b/osdep/getch2.c index 797c02b8dc..403519913a 100644 --- a/osdep/getch2.c +++ b/osdep/getch2.c @@ -62,10 +62,10 @@ static int getch2_key_db=0; #if 0 #include <termcap.h> #else - extern int tgetent (char *BUFFER, char *TERMTYPE); - extern int tgetnum (char *NAME); - extern int tgetflag (char *NAME); - extern char *tgetstr (char *NAME, char **AREA); +int tgetent(char *BUFFER, char *TERMTYPE); +int tgetnum(char *NAME); +int tgetflag(char *NAME); +char *tgetstr(char *NAME, char **AREA); #endif static char term_buffer[4096]; |