summaryrefslogtreecommitdiffstats
path: root/osdep/getch2.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@symbol.nonexistent.invalid>2008-08-08 02:04:43 +0300
committerUoti Urpala <uau@symbol.nonexistent.invalid>2008-08-08 02:13:09 +0300
commit17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069 (patch)
tree5d1910a2ab6381f6b4fb0ffc2834f55f7fef7129 /osdep/getch2.c
parent2ba9df3df3d61a7cc1bde9f897bc77eaaf14b383 (diff)
parentaf76be6e197382af491fadef3fcf821a721c99f5 (diff)
downloadmpv-17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069.tar.bz2
mpv-17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069.tar.xz
Merge svn changes up to r27441
Conflicts: cfg-common-opts.h command.c configure input/input.c libmpcodecs/dec_video.c libmpcodecs/vd.c libmpdemux/stheader.h libvo/sub.c libvo/video_out.c libvo/vo_xv.c libvo/vosub_vidix.c libvo/x11_common.c libvo/x11_common.h mp_core.h mplayer.c stream/stream.h
Diffstat (limited to 'osdep/getch2.c')
-rw-r--r--osdep/getch2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/osdep/getch2.c b/osdep/getch2.c
index c9cb4f6319..51ef8c77f0 100644
--- a/osdep/getch2.c
+++ b/osdep/getch2.c
@@ -28,7 +28,7 @@
#endif
#endif
-#if defined(HAVE_LANGINFO) && defined(HAVE_ICONV)
+#if defined(HAVE_LANGINFO) && defined(CONFIG_ICONV)
#include <locale.h>
#include <langinfo.h>
#endif
@@ -271,7 +271,7 @@ void getch2_disable(void){
getch2_status=0;
}
-#ifdef HAVE_ICONV
+#ifdef CONFIG_ICONV
char* get_term_charset(void)
{
char* charset = NULL;