diff options
| author | nexus <nexus@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-28 23:00:25 +0000 |
|---|---|---|
| committer | nexus <nexus@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-28 23:00:25 +0000 |
| commit | af4654d926f6bf8c0dccb7e97075bfbc8dee161b (patch) | |
| tree | dad7446d93bf927d56954495b411110b7daac212 | |
| parent | 0f4f7e27cfb46b45c558a35f01f400f193e9bc7b (diff) | |
| download | mpv-af4654d926f6bf8c0dccb7e97075bfbc8dee161b.tar.bz2 mpv-af4654d926f6bf8c0dccb7e97075bfbc8dee161b.tar.xz | |
FreeBSD iconv change/fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7129 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | Gui/interface.c | 6 | ||||
| -rwxr-xr-x | configure | 13 | ||||
| -rw-r--r-- | subreader.c | 4 |
3 files changed, 5 insertions, 18 deletions
diff --git a/Gui/interface.c b/Gui/interface.c index 97d9d0c7e3..393a3bfd93 100644 --- a/Gui/interface.c +++ b/Gui/interface.c @@ -30,11 +30,7 @@ #include <sys/types.h> #ifdef USE_ICONV - #ifdef __FreeBSD__ - #include <giconv.h> - #else - #include <iconv.h> - #endif +#include <iconv.h> #endif #include "../libmpdemux/stream.h" @@ -3527,11 +3527,8 @@ fi echocheck "iconv" if test "$_iconv" = auto ; then - if freebsd ; then - _iconv_tmp='#include <giconv.h>' - else - _iconv_tmp='#include <iconv.h>' - fi + _iconv_tmp='#include <iconv.h>' + cat > $TMPC << EOF #include <stdio.h> #include <unistd.h> @@ -3564,9 +3561,7 @@ int main(void) { } EOF _iconv=no - if freebsd ; then - cc_check -lm -lgiconv && _iconv=yes - elif bsdos || openbsd ; then + if freebsd || bsdos || openbsd ; then cc_check -lm -liconv && _iconv=yes else cc_check -lm && _iconv=yes @@ -3574,7 +3569,7 @@ EOF fi if test "$_iconv" = yes ; then _def_iconv='#define USE_ICONV 1' - freebsd && _ld_iconv='-lgiconv' + freebsd && _ld_iconv='-liconv' bsdos && _ld_iconv='-liconv' openbsd && _ld_iconv='-liconv' else diff --git a/subreader.c b/subreader.c index 01d1f44fb5..daa6673893 100644 --- a/subreader.c +++ b/subreader.c @@ -19,11 +19,7 @@ #define ERR ((void *) -1) #ifdef USE_ICONV -#ifdef __FreeBSD__ -#include <giconv.h> -#else #include <iconv.h> -#endif char *sub_cp=NULL; #endif |