Import Ultrix update, change #2864,

To: perlbug@perl.com
Subject: Not OK: perl 5.00503 +MAINT_TRIAL_5 on RISC-ultrix 4.4 (UNINSTALLED)
Message-Id: <9902110433.AA12816@abyss.zk3.dec.com>

p4raw-link: @2864 on //depot/maint-5.005/perl: b47ccd61abe27ff67b6495fce49fc0fe9fa4cc76

p4raw-id: //depot/cfgperl@2946

diff --git a/doio.c b/doio.c
index 1719bf1..79db3aa 100644 (file)
--- a/doio.c
+++ b/doio.c
@@ -18,13 +18,12 @@
 #include "perl.h"
 
 #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM)
+#ifndef HAS_SEM
 #include <sys/ipc.h>
+#endif
 #ifdef HAS_MSG
 #include <sys/msg.h>
 #endif
-#ifdef HAS_SEM
-#include <sys/sem.h>
-#endif
 #ifdef HAS_SHM
 #include <sys/shm.h>
 # ifndef HAS_SHMAT_PROTOTYPE

diff --git a/ext/IPC/SysV/SysV.xs b/ext/IPC/SysV/SysV.xs
index f13e01a..0aaf052 100644 (file)
--- a/ext/IPC/SysV/SysV.xs
+++ b/ext/IPC/SysV/SysV.xs
@@ -7,13 +7,12 @@
 #   include <asm/page.h>
 #endif
 #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM)
+#ifndef HAS_SEM
 #   include <sys/ipc.h>
+#endif
 #   ifdef HAS_MSG
 #       include <sys/msg.h>
 #   endif
-#   ifdef HAS_SEM
-#       include <sys/sem.h>
-#   endif
 #   ifdef HAS_SHM
 #       if defined(PERL_SCO) || defined(PERL_ISC)
 #           include <sys/sysmacros.h>  /* SHMLBA */
@@ -29,6 +28,11 @@
 #   endif
 #endif
 
+/* Required to get 'struct pte' for SHMLBA on ULTRIX. */
+#if defined(__ultrix) || defined(__ultrix__) || defined(ultrix)
+#include <machine/pte.h>
+#endif
+
 /* Required in BSDI to get PAGE_SIZE definition for SHMLBA.
  * Ugly.  More beautiful solutions welcome.
  * Shouting at BSDI sounds quite beautiful. */

diff --git a/hints/ultrix_4.sh b/hints/ultrix_4.sh
index ed9fe5b..9217cc3 100644 (file)
--- a/hints/ultrix_4.sh
+++ b/hints/ultrix_4.sh
@@ -34,16 +34,16 @@ case "$cc" in
 *gcc*) ;;
 *)
     case "$osvers" in
-    *4.1*)     ccflags="$ccflags -DLANGUAGE_C -Olimit 3200" ;;
-    *4.2*)     ccflags="$ccflags -DLANGUAGE_C -Olimit 3200"
+    *4.1*)     ccflags="$ccflags -DLANGUAGE_C -Olimit 3400" ;;
+    *4.2*)     ccflags="$ccflags -DLANGUAGE_C -Olimit 3400"
                # Prototypes sometimes cause compilation errors in 4.2.
                prototype=undef   
                case "$myuname" in
                *risc*)  d_volatile=undef ;;
                esac
                ;;
-    *4.3*)     ccflags="$ccflags -std1 -DLANGUAGE_C -Olimit 3200" ;;
-    *) ccflags="$ccflags -std -Olimit 3200" ;;
+    *4.3*)     ccflags="$ccflags -std1 -DLANGUAGE_C -Olimit 3400" ;;
+    *) ccflags="$ccflags -std -Olimit 3400" ;;
     esac
     ;;
 esac