RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-25 04:38:01 +00:00
Code Issues Releases Wiki Activity

FreeBSD iconv change/fix

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7129 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
nexus 2002-08-28 23:00:25 +00:00
parent 0f4f7e27cf
commit af4654d926
3 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Gui/interface.c
View File

@ -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"

13
configure vendored
View File

@ -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

4
subreader.c
View File

@ -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