summaryrefslogtreecommitdiffstats
path: root/osdep
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2008-12-04 01:55:52 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2008-12-04 01:55:52 +0200
commit8c144171bb80dd3d1f7161b97675e78cad00bc65 (patch)
tree7ad930ebc554ab68af1911f4dfd217cc18b86cce /osdep
parent52ee93c1c64dfaa0afc881c38154b04c100cb617 (diff)
parent8c5889004f7ba9f6fcbca20a05a9301771348408 (diff)
downloadmpv-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')
-rw-r--r--osdep/getch2.c8
-rw-r--r--osdep/getch2.h12
2 files changed, 10 insertions, 10 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];
diff --git a/osdep/getch2.h b/osdep/getch2.h
index 852206bd8e..a85969207c 100644
--- a/osdep/getch2.h
+++ b/osdep/getch2.h
@@ -12,21 +12,21 @@ extern int screen_height;
extern char * erase_to_end_of_line;
/* Get screen-size using IOCTL call. */
-extern void get_screen_size(void);
+void get_screen_size(void);
/* Load key definitions from the TERMCAP database. 'termtype' can be NULL */
-extern int load_termcap(char *termtype);
+int load_termcap(char *termtype);
/* Enable and disable STDIN line-buffering */
-extern void getch2_enable(void);
-extern void getch2_disable(void);
+void getch2_enable(void);
+void getch2_disable(void);
/* Read a character or a special key code (see keycodes.h) */
struct mp_fifo;
-extern void getch2(struct mp_fifo *fifo);
+void getch2(struct mp_fifo *fifo);
/* slave cmd function for Windows and OS/2 */
-extern int mp_input_slave_cmd_func(int fd,char* dest,int size);
+int mp_input_slave_cmd_func(int fd,char* dest,int size);
#if defined(__MINGW32__) || defined(__OS2__)
#define USE_SELECT 0