From 5f1cd43e68c958a11d797ad37c7dd6d5b2f8714a Mon Sep 17 00:00:00 2001
From: unknown <lenz@mysql.com>
Date: Tue, 22 Jun 2004 17:35:34 +0200
Subject:  - Applied some portability fixes for SGI IRIX/MipsPro compiler   
 (e.g. a fix for BUG#3507 and some modifications recommended    by Andrea
 Suatoni and Joerg Behrens - thank you!)

acinclude.m4:
   - OpenSSL libs are installed in /usr/freeware/include and
     /usr/freeware/lib32 on SGI IRIX - expanded search list
man/mysqlaccess.1.in:
   - cosmetical fix
man/mysqldump.1.in:
   - cosmetical fix
mysys/hash.c:
   - portability fix: some compilers can't handle inlining of rec_hashnr
     (BUG#3507)
vio/test-sslserver.c:
   - portability fix for SGI MipsPro compiler: define client_len as
     "socklen_t" instead of "size_t"
---
 acinclude.m4         | 5 +++--
 man/mysqlaccess.1.in | 3 +--
 man/mysqldump.1.in   | 2 +-
 mysys/hash.c         | 2 +-
 vio/test-sslserver.c | 5 +++++
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 469b7cef6dd..a88957ea3df 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -737,14 +737,15 @@ AC_DEFUN(MYSQL_FIND_OPENSSL, [
     ---)
       for d in /usr/ssl/include /usr/local/ssl/include /usr/include \
 /usr/include/ssl /opt/ssl/include /opt/openssl/include \
-/usr/local/ssl/include /usr/local/include ; do
+/usr/local/ssl/include /usr/local/include /usr/freeware/include ; do
        if test -f $d/openssl/ssl.h  ; then
          OPENSSL_INCLUDE=-I$d
        fi
       done
 
       for d in /usr/ssl/lib /usr/local/ssl/lib /usr/lib/openssl \
-/usr/lib /usr/lib64 /opt/ssl/lib /opt/openssl/lib /usr/local/lib/ ; do
+/usr/lib /usr/lib64 /opt/ssl/lib /opt/openssl/lib \
+/usr/freeware/lib32 /usr/local/lib/ ; do
       if test -f $d/libssl.a || test -f $d/libssl.so || test -f $d/libssl.dylib ; then
         OPENSSL_LIB=$d
       fi
diff --git a/man/mysqlaccess.1.in b/man/mysqlaccess.1.in
index 9a5e58541d2..cf2e0658a1c 100644
--- a/man/mysqlaccess.1.in
+++ b/man/mysqlaccess.1.in
@@ -1,7 +1,6 @@
 .TH mysqlaccess 1 "19 December 2000" "MySQL @MYSQL_BASE_VERSION@" "MySQL database"
 .SH NAME
-.BR mysqlaccess
- \- Create new users to mysql.
+.BR mysqlaccess \- Create new users to mysql.
 .SH USAGE
 mysqlaccess [host [user [db]]] OPTIONS
 .SH SYNOPSIS
diff --git a/man/mysqldump.1.in b/man/mysqldump.1.in
index 34d83dbe0b3..6d1cc80c837 100644
--- a/man/mysqldump.1.in
+++ b/man/mysqldump.1.in
@@ -1,6 +1,6 @@
 .TH mysqldump 1 "19 December 2000" "MySQL @MYSQL_BASE_VERSION@" "MySQL database"
 .SH NAME
-mysqldump \- text-based client for dumping or backing up mysql databases , tables and or data.
+mysqldump \- text\-based client for dumping or backing up mysql databases, tables and or data.
 
 .SH  USAGE
 .BR "mysqldump [\fP\fIOPTIONS\fP] database [\fP\fItables\fP]"
diff --git a/mysys/hash.c b/mysys/hash.c
index 3afd31a079b..12389e3cf1c 100644
--- a/mysys/hash.c
+++ b/mysys/hash.c
@@ -182,7 +182,7 @@ uint calc_hashnr_caseup(const byte *key, uint len)
 #endif
 
 
-#ifndef __SUNPRO_C				/* SUNPRO can't handle this */
+#if !defined(__SUNPRO_C) && !defined(__USLC__) && !defined(__sgi) /* broken compilers */
 inline
 #endif
 unsigned int rec_hashnr(HASH *hash,const byte *record)
diff --git a/vio/test-sslserver.c b/vio/test-sslserver.c
index 71b194838c7..d05e50af16b 100644
--- a/vio/test-sslserver.c
+++ b/vio/test-sslserver.c
@@ -91,7 +91,12 @@ main(int argc __attribute__((unused)), char** argv)
 	struct sockaddr_in sa_cli;
 	int listen_sd;
 	int err;
+
+#if defined(__sgi) && _NO_XOPEN4 && _NO_XOPEN5
+	socklen_t client_len;
+#else
 	size_t client_len;
+#endif
 	int	reuseaddr = 1; /* better testing, uh? */
 
 	MY_INIT(argv[0]);
-- 
cgit v1.2.1