RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Properly declare get_term_charset() instead of forward declaring it. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30710 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2010-02-22 15:34:56 +00:00
parent cc8a878a9c
commit 7262f6c9b4
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mp_msg.c
View File

@ -22,18 +22,11 @@
#include <string.h> #include <string.h>
#include "config.h" #include "config.h"
#include "osdep/getch2.h"
#ifdef CONFIG_ICONV #ifdef CONFIG_ICONV
#include <iconv.h> #include <iconv.h>
#include <errno.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 #endif
#if defined(FOR_MENCODER) #if defined(FOR_MENCODER)

13
osdep/getch2.h
View File

@ -24,6 +24,8 @@
#ifndef MPLAYER_GETCH2_H #ifndef MPLAYER_GETCH2_H
#define MPLAYER_GETCH2_H #define MPLAYER_GETCH2_H
#include "config.h"
/* Screen size. Initialized by load_termcap() and get_screen_size() */ /* Screen size. Initialized by load_termcap() and get_screen_size() */
extern int screen_width; extern int screen_width;
extern int screen_height; extern int screen_height;
@ -44,6 +46,17 @@ void getch2_disable(void);
/* Read a character or a special key code (see keycodes.h) */ /* Read a character or a special key code (see keycodes.h) */
void getch2(void); 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 */ /* slave cmd function for Windows and OS/2 */
int mp_input_slave_cmd_func(int fd,char* dest,int size); int mp_input_slave_cmd_func(int fd,char* dest,int size);