summaryrefslogtreecommitdiffstats
path: root/osdep/getch2-win.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@symbol.nonexistent.invalid>2008-07-30 16:39:24 +0300
committerUoti Urpala <uau@symbol.nonexistent.invalid>2008-07-30 16:39:24 +0300
commit04f3909a724a06ca5a5a3921061f2ba9fb9d8787 (patch)
treeb09b4c45898be2754f156ebba16fa1054f42788d /osdep/getch2-win.c
parent3a69d65f8d07c54f4c9eb2d9c89ab50e35d0a50d (diff)
parent1fdf02e6fbd896c8fcce03992ecdf36144d85714 (diff)
downloadmpv-04f3909a724a06ca5a5a3921061f2ba9fb9d8787.tar.bz2
mpv-04f3909a724a06ca5a5a3921061f2ba9fb9d8787.tar.xz
Merge svn changes up to r27374
Conflicts: cfg-common-opts.h cfg-mplayer.h command.c configure libmpcodecs/dec_video.c libmpcodecs/vd.c libmpcodecs/vf_vo.c libmpdemux/demuxer.h libmpdemux/stheader.h mp_core.h mplayer.c stream/stream_radio.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 6f9567c3db..49ec9c46b3 100644
--- a/osdep/getch2-win.c
+++ b/osdep/getch2-win.c
@@ -144,7 +144,7 @@ void getch2_disable(){
getch2_status=0;
}
-#ifdef USE_ICONV
+#ifdef CONFIG_ICONV
static const struct {
unsigned cp;
char* alias;