diff options
author | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-03-18 22:18:11 +0000 |
---|---|---|
committer | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-03-18 22:18:11 +0000 |
commit | a09d3e1bc7deea9775705544bac7ea7b94234e4c (patch) | |
tree | 3fbff43643867b5f8685b1cb6a993be03866617a | |
parent | e72f48c19f40a5e390f205396c47f94432d48033 (diff) | |
download | mpv-a09d3e1bc7deea9775705544bac7ea7b94234e4c.tar.bz2 mpv-a09d3e1bc7deea9775705544bac7ea7b94234e4c.tar.xz |
check that definition of prototype of sysi86(int, void*) doesn't conflict; fixed compilation in opensolaris
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22733 b3059339-0415-0410-9bf9-f77b7e298cf2
-rwxr-xr-x | configure | 6 | ||||
-rw-r--r-- | loader/ldt_keeper.c | 4 |
2 files changed, 8 insertions, 2 deletions
@@ -3590,6 +3590,11 @@ _sysi86=no cc_check && _sysi86=yes if test "$_sysi86" = yes ; then _def_sysi86='#define HAVE_SYSI86 1' + cat > $TMPC << EOF + #include <sys/sysi86.h> + int main (void) { int sysi86(int, void*); sysi86(0); return 0; } +EOF + cc_check && _def_sysi86_iv='#define HAVE_SYSI86_iv 1' else _def_sysi86='#undef HAVE_SYSI86' fi @@ -7932,6 +7937,7 @@ int setenv(const char *name, const char *val, int overwrite); /* Define this if your system has sysi86 */ $_def_sysi86 +$_def_sysi86_iv /* Define this if your system has pthreads */ $_def_pthreads diff --git a/loader/ldt_keeper.c b/loader/ldt_keeper.c index ec2de5dbd0..cc0b2393bc 100644 --- a/loader/ldt_keeper.c +++ b/loader/ldt_keeper.c @@ -62,8 +62,8 @@ int modify_ldt(int func, void *ptr, unsigned long bytecount); #include <sys/segment.h> #include <sys/sysi86.h> -/* solaris x86: add missing prototype for sysi86() */ -#ifdef HAVE_SYSI86 +/* solaris x86: add missing prototype for sysi86(), but only when sysi86(int, void*) is known to be valid */ +#ifdef HAVE_SYSI86_iv #ifdef __cplusplus extern "C" { #endif |