From 82ad2e8f5b9c80e6696d9298cda365c9ff6421a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Fri, 9 Mar 2007 23:49:35 +0000
Subject: Declare sysi86() function only if it's not declared already. Patch by
 Albert Lee.

CVS patchset: 8648
CVS date: 2007/03/09 23:49:35
---
 configure.ac                    | 5 +++++
 src/libw32dll/wine/ldt_keeper.c | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 4418cb841..58b68a811 100644
--- a/configure.ac
+++ b/configure.ac
@@ -285,6 +285,11 @@ LIBS="$ac_save_LIBS"
 
 AC_MSG_RESULT($have_recursive_mutex)
 
+AC_CHECK_DECL(sysi86,[
+	AC_DEFINE(HAVE_SYSI86,1,[Define this if the 'sysi86' function is declared in sys/sysi86.h])
+      ],,[
+#include <sys/sysi86.h>
+])
 
 dnl ---------------------------------------------
 dnl Windows ports checks
diff --git a/src/libw32dll/wine/ldt_keeper.c b/src/libw32dll/wine/ldt_keeper.c
index 11711ce62..7f7169b86 100644
--- a/src/libw32dll/wine/ldt_keeper.c
+++ b/src/libw32dll/wine/ldt_keeper.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: ldt_keeper.c,v 1.15 2006/05/07 09:31:57 valtri Exp $
+ * $Id: ldt_keeper.c,v 1.16 2007/03/09 23:49:35 dgp85 Exp $
  *
  *
  * contents:
@@ -54,6 +54,7 @@
 
 /* applied some modification to make make our xine friend more happy */
 #include "ldt_keeper.h"
+#include "config.h"
 
 #include <string.h>
 #include <stdlib.h>
@@ -90,6 +91,7 @@ int modify_ldt(int func, void *ptr, unsigned long bytecount);
 #include <sys/sysi86.h>
 
 /* solaris x86: add missing prototype for sysi86() */
+#ifndef HAVE_SYSI86
 #ifdef  __cplusplus
 extern "C" {
 #endif
@@ -97,6 +99,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 */
-- 
cgit v1.2.3