Merge svn changes up to r30732

4 files changed, 42 insertions, 3 deletions

diff --git a/osdep/getch2.h b/osdep/getch2.h
index 1156aedf7a..7ee40d9e98 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;
@@ -45,10 +47,20 @@ void getch2_disable(void);
 struct mp_fifo;
 void getch2(struct mp_fifo *fifo);
 
-/* slave cmd function for Windows and OS/2 */
-int mp_input_slave_cmd_func(int fd,char* dest,int size);
+#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
 
 #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);
 #define USE_SELECT  0
 #define MP_INPUT_SLAVE_CMD_FUNC     mp_input_slave_cmd_func
 #else
diff --git a/osdep/macosx_finder_args.c b/osdep/macosx_finder_args.c
index 81c1959894..cbd88ad4ac 100644
--- a/osdep/macosx_finder_args.c
+++ b/osdep/macosx_finder_args.c
@@ -23,6 +23,7 @@
 #include "m_option.h"
 #include "m_config.h"
 #include "playtree.h"
+#include "macosx_finder_args.h"
 
 static play_tree_t *files=NULL;
 
diff --git a/osdep/macosx_finder_args.h b/osdep/macosx_finder_args.h
new file mode 100644
index 0000000000..fd047181a4
--- /dev/null
+++ b/osdep/macosx_finder_args.h
@@ -0,0 +1,26 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPLAYER_MACOSX_FINDER_ARGS_H
+#define MPLAYER_MACOSX_FINDER_ARGS_H
+
+#include "playtree.h"
+
+play_tree_t *macosx_finder_args(m_config_t *config, int argc, char **argv);
+
+#endif /* MPLAYER_MACOSX_FINDER_ARGS_H */
diff --git a/osdep/timer-darwin.c b/osdep/timer-darwin.c
index e0b4622c00..bc25a57761 100644
--- a/osdep/timer-darwin.c
+++ b/osdep/timer-darwin.c
@@ -34,7 +34,7 @@ const char timer_name[] = "Darwin accurate";
 
 
 /* the core sleep function, uses floats and is used in MPlayer G2 */
-float sleep_accurate(float time_frame)
+static float sleep_accurate(float time_frame)
 {
 	uint64_t deadline = time_frame / timebase_ratio + mach_absolute_time();