Index: /trunk/docs/Changelog
===================================================================
--- /trunk/docs/Changelog	(revision 48)
+++ /trunk/docs/Changelog	(revision 49)
@@ -1,2 +1,9 @@
+
+	* fix sh_extern.c: sh_ext_add_default() cast to (void) was too early
+	  (Solaris 8 build failure reported by Jesse)
+	* fix sh_unix.c: wrong prototype for sh_unix_mlock() 
+	  if HAVE_BROKEN_MLOCK (AIX 5.2 build failure reported by
+          Jonathan Kaufman) 
+
 2.2.1b (20-06-2006):
 	* fix compile error on SuSE 10.1 (reported by Leonhard Maylein)
Index: /trunk/src/kern_head.c
===================================================================
--- /trunk/src/kern_head.c	(revision 48)
+++ /trunk/src/kern_head.c	(revision 49)
@@ -143,5 +143,5 @@
   if (fd < 0)
     {
-      perror("read_kcode: open");
+      perror("read_kcode: open /dev/kmem");
       return -1;
     }
Index: /trunk/src/sh_extern.c
===================================================================
--- /trunk/src/sh_extern.c	(revision 48)
+++ /trunk/src/sh_extern.c	(revision 49)
@@ -1077,7 +1077,8 @@
 int sh_ext_add_default (const char * dummy)
 {
-  (void) dummy;
   char * p = NULL;
   int    i;
+
+  (void) dummy;
 
   SL_ENTER(_("sh_ext_add_default"));
@@ -1102,4 +1103,5 @@
 {
   int i;
+
   SL_ENTER(_("sh_ext_add_environ"));
   i = sh_ext_add_envv (NULL, str);
Index: /trunk/src/sh_unix.c
===================================================================
--- /trunk/src/sh_unix.c	(revision 48)
+++ /trunk/src/sh_unix.c	(revision 49)
@@ -3926,6 +3926,7 @@
 }
 #else
-int sh_unix_mlock (void * in_addr, size_t len)
-{
+int sh_unix_mlock (char * file, int line, void * in_addr, size_t len)
+{
+  (void) file;    (void) line;
   (void) in_addr; (void) len;
   return -1;