mirror of
https://github.com/mpv-player/mpv
synced 2025-01-02 04:42:10 +00:00
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:
parent
cc8a878a9c
commit
7262f6c9b4
9
mp_msg.c
9
mp_msg.c
@ -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)
|
||||
|
@ -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 @@ void getch2_disable(void);
|
||||
/* 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);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user