diff options
| author | Gurusamy Sarathy <gsar@cpan.org> | 1999-02-16 06:18:27 +0000 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 1999-02-16 06:18:27 +0000 |
| commit | 99ed61e6cc0c0db3082cc4fadff22a2fe3b2049f (patch) | |
| tree | 79ef307428b21baceb40f5d0e3436553e178c8f8 /ext | |
| parent | cceca5ed003bac658cb0392a14bb2f26d434bd78 (diff) | |
| parent | 9de70c85adb9a4d3b22d09bb8920e00bf4051bdb (diff) | |
| download | perl-99ed61e6cc0c0db3082cc4fadff22a2fe3b2049f.tar.gz | |
integrate change#2852 from maint-5.005; integrate cfgperl contents;
elide dups and non-dependents from Changes
p4raw-link: @2852 on //depot/maint-5.005/perl: 9d2bcc06253ec4693886be5b5b7869bda6582d6e
p4raw-id: //depot/perl@2958
p4raw-integrated: from //depot/maint-5.005/perl@2957 'copy in'
README.threads (@1717..) 'merge in' INSTALL (@2737..)
p4raw-integrated: from //depot/maint-5.005/perl@2852 'merge in'
Configure (@2837..)
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/IPC/SysV/SysV.xs | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/ext/IPC/SysV/SysV.xs b/ext/IPC/SysV/SysV.xs index 06059186c6..0aaf0527a1 100644 --- 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 */ @@ -22,13 +21,18 @@ # ifndef HAS_SHMAT_PROTOTYPE extern Shmat_t shmat _((int, char *, int)); # endif -# if defined(__NetBSD__) && defined(__sparc__) +# if defined(__sparc__) && (defined(__NetBSD__) || defined(__OpenBSD__)) # undef SHMLBA /* not static: determined at boot time */ # define SHMLBA getpagesize() # endif # 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. */ |