From 9b76bca8cf6dc34facb07c99428ea219fae037fb Mon Sep 17 00:00:00 2001
From: unknown <jani@a193-229-222-105.elisa-laajakaista.fi>
Date: Thu, 18 Aug 2005 21:26:25 +0300
Subject: [PATCH] Some minor fixes for Netware. These were required after we
 started building against a later version of libc.

include/config-netware.h:
  Changes for Netware. Needed to build against newer libc.
netware/BUILD/nwbootstrap:
  Fix to build script.
sql/mysqld.cc:
  Added an include.
---
 include/config-netware.h  | 12 ++++++++++++
 netware/BUILD/nwbootstrap |  8 +-------
 sql/mysqld.cc             |  1 +
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/include/config-netware.h b/include/config-netware.h
index 3e145f566a1..578975a1cea 100644
--- a/include/config-netware.h
+++ b/include/config-netware.h
@@ -50,6 +50,18 @@ extern "C" {
 #define HAVE_PTHREAD_YIELD_ZERO_ARG 1
 #define HAVE_BROKEN_REALPATH 1
 
+/*required adjustments with LibC-June-2004 */
+#undef HAVE_POSIX_SIGNALS
+#undef HAVE_PTHREAD_ATTR_SETSCOPE
+#undef HAVE_ALLOCA_H
+#undef HAVE_FINITE
+#undef HAVE_GETPWNAM
+#undef HAVE_GETPWUID
+#undef HAVE_PTHREAD_SETSCHEDPARAM
+#undef HAVE_READLINK
+#undef HAVE_STPCPY
+/*required adjustments with LibC-June-2004 */
+
 /* no libc crypt() function */
 #ifdef HAVE_OPENSSL
   #define HAVE_CRYPT 1
diff --git a/netware/BUILD/nwbootstrap b/netware/BUILD/nwbootstrap
index 2ba90e32fa7..a420aa8b64c 100755
--- a/netware/BUILD/nwbootstrap
+++ b/netware/BUILD/nwbootstrap
@@ -171,15 +171,9 @@ do
   rm $file.org
 done
 
-# create the libmysql.imp file in netware folder from libmysql/libmysql.def
-# file
-echo "generating llibmysql.imp file..."
-awk 'BEGIN{x=0;}  x==1 {print $1;next} /EXPORTS/{x=1}' libmysql/libmysql.def > netware/libmysql.imp
-
 # create the libmysql.imp file in netware folder from libmysql/libmysql.def file
 echo "generating llibmysql.imp file..."
-awk 'BEGIN{x=0;}  x==1 {print $1;next} /EXPORTS/{x=1}' libmysql/libmysql.def > netware/libmysql.imp
-
+awk 'BEGIN{x=0;}  END{printf("\n");} x==1 {printf(" %s",$1); x++; next} x>1 {printf(",\n %s", $1);next} /EXPORTS/{x=1}' libmysql/libmysql.def > netware/libmysql.imp
 
 # build linux tools
 echo "compiling linux tools..."
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 82335e7d706..ac66874888b 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -114,6 +114,7 @@ int deny_severity = LOG_WARNING;
 #endif
 
 #ifdef __NETWARE__
+#include <nks/netware.h>
 #include <nks/vm.h>
 #include <library.h>
 #include <monitor.h>