summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mp_msg.c9
-rw-r--r--osdep/getch2.h13
2 files changed, 14 insertions, 8 deletions
diff --git a/mp_msg.c b/mp_msg.c
index 93f793d7c8..a5405c59f4 100644
--- a/mp_msg.c
+++ b/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)
diff --git a/osdep/getch2.h b/osdep/getch2.h
index f6f416b2a7..35e9801970 100644
--- a/osdep/getch2.h
+++ b/osdep/getch2.h
@@ -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);