RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

better FreeBSD iconv implementation 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2359 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
nexus 2001-10-22 07:43:32 +00:00
parent e1309e782b
commit 43e4f2c792
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
configure vendored
View File

@ -896,10 +896,16 @@ else
cc_check $_x11libdir -lX11 -lXext -lGL -lm $_socklib && _gl=yes cc_check $_x11libdir -lX11 -lXext -lGL -lm $_socklib && _gl=yes
fi fi
if freebsd ; then
_iconv_tmp='#include <giconv.h>'
else
_iconv_tmp='#include <iconv.h>'
fi
cat > $TMPC << EOF cat > $TMPC << EOF
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
#include <iconv.h> $_iconv_tmp
#define INBUFSIZE 1024 #define INBUFSIZE 1024
#define OUTBUFSIZE 4096 #define OUTBUFSIZE 4096
@ -930,7 +936,10 @@ main()
EOF EOF
_iconv=yes _iconv=yes
if freebsd || bsdos ; then if freebsd ; then
cc_check $_extraincdir $_extralibdir -lm -lgiconv >/dev/null 2>&1 || \
{ _iconv=no ; echo "iconv(3) function not detected!" ;}
elif bsdos ; then
cc_check $_extraincdir $_extralibdir -lm -liconv >/dev/null 2>&1 || \ cc_check $_extraincdir $_extralibdir -lm -liconv >/dev/null 2>&1 || \
{ _iconv=no ; echo "iconv(3) function not detected!" ;} { _iconv=no ; echo "iconv(3) function not detected!" ;}
else else
@ -1878,7 +1887,9 @@ fi
if test "$_iconv" = yes ; then if test "$_iconv" = yes ; then
_iconv='#define USE_ICONV' _iconv='#define USE_ICONV'
if freebsd || bsdos ; then if freebsd ; then
_iconvlib="-lgiconv"
elif bsdos ; then
_iconvlib="-liconv" _iconvlib="-liconv"
fi fi
else else

4
subreader.c
View File

@ -18,7 +18,11 @@
#define ERR (void *)-1 #define ERR (void *)-1
#ifdef USE_ICONV #ifdef USE_ICONV
#ifdef __FreeBSD__
#include <giconv.h>
#else
#include <iconv.h> #include <iconv.h>
#endif
char *sub_cp=NULL; char *sub_cp=NULL;
#endif #endif