summaryrefslogtreecommitdiffstats
path: root/osdep/getch2-win.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@symbol.nonexistent.invalid>2008-08-02 22:04:35 +0300
committerUoti Urpala <uau@symbol.nonexistent.invalid>2008-08-02 22:04:35 +0300
commit6cce822505c0a76ac520909a895021b8f5b7e5ab (patch)
treef8ba954c698470208a243be3da216f7f54367f46 /osdep/getch2-win.c
parent04f3909a724a06ca5a5a3921061f2ba9fb9d8787 (diff)
parentded7033671fb7d84fbdb67ace46c1fc8833631bc (diff)
downloadmpv-6cce822505c0a76ac520909a895021b8f5b7e5ab.tar.bz2
mpv-6cce822505c0a76ac520909a895021b8f5b7e5ab.tar.xz
Merge svn changes up to r27399
Conflicts: libmpcodecs/vd.c libmpcodecs/ve_raw.c libvo/video_out.c libvo/x11_common.c mplayer.c
Diffstat (limited to 'osdep/getch2-win.c')
-rw-r--r--osdep/getch2-win.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/osdep/getch2-win.c b/osdep/getch2-win.c
index 49ec9c46b3..feaf5f74d9 100644
--- a/osdep/getch2-win.c
+++ b/osdep/getch2-win.c
@@ -144,7 +144,7 @@ void getch2_disable(){
getch2_status=0;
}
-#ifdef CONFIG_ICONV
+#ifdef HAVE_ICONV
static const struct {
unsigned cp;
char* alias;