[MPlayer-cvslog] r22733 - in trunk: configure loader/ldt_keeper.c

[nicodvb]

Author: nicodvb
Date: Sun Mar 18 23:18:11 2007
New Revision: 22733

Modified:
   trunk/configure
   trunk/loader/ldt_keeper.c

Log:
check that definition of prototype of sysi86(int, void*) doesn't conflict; fixed compilation in opensolaris

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Sun Mar 18 23:18:11 2007
@@ -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 
 
 /* Define this if your system has sysi86 */
 $_def_sysi86
+$_def_sysi86_iv
 
 /* Define this if your system has pthreads */
 $_def_pthreads

Modified: trunk/loader/ldt_keeper.c
==============================================================================
--- trunk/loader/ldt_keeper.c	(original)
+++ trunk/loader/ldt_keeper.c	Sun Mar 18 23:18:11 2007
@@ -62,8 +62,8 @@ int modify_ldt(int func, void *ptr, unsi
 #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