Mercurial > mplayer.hg
changeset 30668:46e7233f1faa
Properly declare get_term_charset() instead of forward declaring it.
| author | diego |
|---|---|
| date | Mon, 22 Feb 2010 15:34:56 +0000 |
| parents | 6ca16928b1cc |
| children | 44837471a711 |
| files | mp_msg.c osdep/getch2.h |
| diffstat | 2 files changed, 14 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/mp_msg.c Mon Feb 22 14:27:32 2010 +0000 +++ b/mp_msg.c Mon Feb 22 15:34:56 2010 +0000 @@ -22,18 +22,11 @@ #include <string.h> #include "config.h" +#include "osdep/getch2.h" #ifdef CONFIG_ICONV #include <iconv.h> #include <errno.h> -/** - * \brief gets the name of the system's terminal character set - * \return a malloced string indicating the system charset - * - * Be warned that this function on many systems is in no way thread-safe - * since it modifies global data - */ -char* get_term_charset(void); #endif #if defined(FOR_MENCODER)
--- a/osdep/getch2.h Mon Feb 22 14:27:32 2010 +0000 +++ b/osdep/getch2.h Mon Feb 22 15:34:56 2010 +0000 @@ -24,6 +24,8 @@ #ifndef MPLAYER_GETCH2_H #define MPLAYER_GETCH2_H +#include "config.h" + /* Screen size. Initialized by load_termcap() and get_screen_size() */ extern int screen_width; extern int screen_height; @@ -44,6 +46,17 @@ /* Read a character or a special key code (see keycodes.h) */ void getch2(void); +#ifdef CONFIG_ICONV +/** + * \brief gets the name of the system's terminal character set + * \return a malloced string indicating the system charset + * + * Be warned that this function on many systems is in no way thread-safe + * since it modifies global data + */ +char *get_term_charset(void); +#endif + /* slave cmd function for Windows and OS/2 */ int mp_input_slave_cmd_func(int fd,char* dest,int size);