From 7262f6c9b4f3cd1bd8b98bcc40b74a05aa989ebc Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 22 Feb 2010 15:34:56 +0000
Subject: [PATCH] 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
---
 mp_msg.c       |  9 +--------
 osdep/getch2.h | 13 +++++++++++++
 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);