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: 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
---
 osdep/getch2.h | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'osdep/getch2.h')

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);
 
-- 
cgit v1.2.3


From 6676504bbe3ba356585bfc64ee1624ddbecb37ee Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 22 Feb 2010 15:35:53 +0000
Subject: Conditionally declare mp_input_slave_cmd_func(). It does only get
 compiled on MinGW and OS/2.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30711 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 osdep/getch2.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'osdep/getch2.h')

diff --git a/osdep/getch2.h b/osdep/getch2.h
index 35e9801970..5ee6108fc3 100644
--- a/osdep/getch2.h
+++ b/osdep/getch2.h
@@ -57,10 +57,9 @@ void getch2(void);
 char *get_term_charset(void);
 #endif
 
+#if defined(__MINGW32__) || defined(__OS2__)
 /* slave cmd function for Windows and OS/2 */
 int mp_input_slave_cmd_func(int fd,char* dest,int size);
-
-#if defined(__MINGW32__) || defined(__OS2__)
 #define USE_SELECT  0
 #define MP_INPUT_SLAVE_CMD_FUNC     mp_input_slave_cmd_func
 #else
-- 
cgit v1.2.3