diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-04-30 21:17:30 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-04-30 21:17:30 +0000 |
commit | 4a98d0a31325766cb68f9b2d15ecc3e37b891e2a (patch) | |
tree | 1cd69e3565fb7cd2bf07515dd2fd51983c184c52 | |
parent | 0283b8134ff9a8ceade9ad914ad79b35a839dfda (diff) | |
download | mpv-4a98d0a31325766cb68f9b2d15ecc3e37b891e2a.tar.bz2 mpv-4a98d0a31325766cb68f9b2d15ecc3e37b891e2a.tar.xz |
Add a check for sysi86() on Solaris systems, solving a build failure on Solaris
10 x86 to avoid using a local declaration that is no longer compatible.
patch by "Derek E. Lewis", dlewis $$@$$ solnetworks %%.%% net
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18363 b3059339-0415-0410-9bf9-f77b7e298cf2
-rwxr-xr-x | configure | 20 | ||||
-rw-r--r-- | loader/ldt_keeper.c | 2 |
2 files changed, 22 insertions, 0 deletions
@@ -3380,6 +3380,23 @@ fi echores "$_setenv" +if sunos; then +echocheck "sysi86()" +cat > $TMPC << EOF +#include <sys/sysi86.h> +int main (void) { sysi86(0); return 0; } +EOF +_sysi86=no +cc_check && _sysi86=yes +if test "$_sysi86" = yes ; then + _def_sysi86='#define HAVE_SYSI86 1' +else + _def_sysi86='#undef HAVE_SYSI86' +fi +echores "$_sysi86" +fi + + echocheck "sys/sysinfo.h" cat > $TMPC << EOF #include <sys/sysinfo.h> @@ -7701,6 +7718,9 @@ $_def_setenv int setenv(const char *name, const char *val, int overwrite); #endif +/* Define this if your system has sysi86 */ +$_def_sysi86 + /* Define this if your system has pthreads */ $_def_pthreads diff --git a/loader/ldt_keeper.c b/loader/ldt_keeper.c index 00c8cb5a30..7c112c6d2a 100644 --- a/loader/ldt_keeper.c +++ b/loader/ldt_keeper.c @@ -60,6 +60,7 @@ int modify_ldt(int func, void *ptr, unsigned long bytecount); #include <sys/sysi86.h> /* solaris x86: add missing prototype for sysi86() */ +#ifdef HAVE_SYSI86 #ifdef __cplusplus extern "C" { #endif @@ -67,6 +68,7 @@ int sysi86(int, void*); #ifdef __cplusplus } #endif +#endif #ifndef NUMSYSLDTS /* SunOS 2.5.1 does not define NUMSYSLDTS */ #define NUMSYSLDTS 6 /* Let's hope the SunOS 5.8 value is OK */ |