diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-30 16:39:24 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-30 16:39:24 +0300 |
commit | 04f3909a724a06ca5a5a3921061f2ba9fb9d8787 (patch) | |
tree | b09b4c45898be2754f156ebba16fa1054f42788d /osdep/getch2-os2.c | |
parent | 3a69d65f8d07c54f4c9eb2d9c89ab50e35d0a50d (diff) | |
parent | 1fdf02e6fbd896c8fcce03992ecdf36144d85714 (diff) | |
download | mpv-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-os2.c')
-rw-r--r-- | osdep/getch2-os2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/osdep/getch2-os2.c b/osdep/getch2-os2.c index c309a22bce..5d21efbcd0 100644 --- a/osdep/getch2-os2.c +++ b/osdep/getch2-os2.c @@ -33,7 +33,7 @@ #include "mp_fifo.h" #include "getch2.h" -#if defined( USE_LANGINFO ) && defined( USE_ICONV ) +#if defined(CONFIG_LANGINFO) && defined(CONFIG_ICONV) #include <locale.h> #include <langinfo.h> #endif @@ -183,12 +183,12 @@ void getch2_disable( void ) getch2_status = 0; } -#ifdef USE_ICONV +#ifdef CONFIG_ICONV char *get_term_charset( void ) { char *charset = NULL; -#ifdef USE_LANGINFO +#ifdef CONFIG_LANGINFO setlocale( LC_CTYPE, ""); charset = nl_langinfo( CODESET ); setlocale( LC_CTYPE, "C"); |