Changeset 49 for trunk

Timestamp:

Jul 11, 2006, 10:13:37 PM (18 years ago)

Author:

rainer

Message:

Fix for compile failures (solaris 8, AIX 5.2)

Location:

trunk

Files:

• docs/Changelog (modified) (1 diff)
• src/kern_head.c (modified) (1 diff)
• src/sh_extern.c (modified) (2 diffs)
• src/sh_unix.c (modified) (1 diff)

trunk/docs/Changelog

@@ +1 @@
+
+        * 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)

trunk/src/kern_head.c

@@ -143 +143 @@
   if (fd < 0)
     {
-      perror("read_kcode: open");
+      perror("read_kcode: open /dev/kmem");
       return -1;
     }

trunk/src/sh_extern.c

@@ -1077 +1077 @@
 int sh_ext_add_default (const char * dummy)
 {
-  (void) dummy;
   char * p = NULL;
   int    i;
+
+  (void) dummy;
 
   SL_ENTER(_("sh_ext_add_default"));
@@ -1102 +1103 @@
 {
   int i;
+
   SL_ENTER(_("sh_ext_add_environ"));
   i = sh_ext_add_envv (NULL, str);

trunk/src/sh_unix.c

@@ -3926 +3926 @@
 }
 #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;