From 35d288bca1004a06d564f001e704cdac26b2e88b Mon Sep 17 00:00:00 2001
From: Patrik Stridvall <ps@leissner.se>
Date: Mon, 18 Dec 2000 03:13:52 +0000
Subject: [PATCH] Solaris fixes.

---
 configure                | 2 +-
 configure.in             | 2 +-
 tools/winebuild/import.c | 8 +++++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index 77e98446e35..7a30249d59d 100755
--- a/configure
+++ b/configure
@@ -4806,7 +4806,7 @@ fi
 echo "$ac_t""$ac_cv_c_dll_unixware" 1>&6
     if test "$ac_cv_c_dll_unixware" = "yes"
     then
-      LDSHARED="\$(CC) -Wl,-G \$(SONAME:%=-Wl,h,\$(libdir)/%)"
+      LDSHARED="\$(CC) -Wl,-G \$(SONAME:%=-Wl,-h,\$(libdir)/%)"
       LDDLLFLAGS="-Wl,-B,symbolic"
     else
       echo $ac_n "checking "whether we can build a NetBSD dll"""... $ac_c" 1>&6
diff --git a/configure.in b/configure.in
index feb84a9cbdd..bf5ff0b27e3 100644
--- a/configure.in
+++ b/configure.in
@@ -557,7 +557,7 @@ then
     ])
     if test "$ac_cv_c_dll_unixware" = "yes"
     then
-      LDSHARED="\$(CC) -Wl,-G \$(SONAME:%=-Wl,h,\$(libdir)/%)"
+      LDSHARED="\$(CC) -Wl,-G \$(SONAME:%=-Wl,-h,\$(libdir)/%)"
       LDDLLFLAGS="-Wl,-B,symbolic"
     else
       AC_CACHE_CHECK("whether we can build a NetBSD dll",
diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c
index 618abec3f40..57b2f57d63e 100644
--- a/tools/winebuild/import.c
+++ b/tools/winebuild/import.c
@@ -44,7 +44,13 @@ static int name_cmp( const void *name, const void *entry )
 /* locate a symbol in a (sorted) list */
 inline static const char *find_symbol( const char *name, char **table, int size )
 {
-    char **res = bsearch( &name, table, size, sizeof(*table), name_cmp );
+    
+    char **res = NULL;
+
+    if (table) {
+        res = bsearch( &name, table, size, sizeof(*table), name_cmp );
+    }
+
     return res ? *res : NULL;
 }
 
-- 
GitLab