diff options
| author | Jarkko Hietaniemi <jhi@iki.fi> | 2003-08-27 13:01:26 +0000 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2003-08-27 13:01:26 +0000 |
| commit | 5518ecd4c71d9e274b4e6a0c6a7d04bade4a7cd9 (patch) | |
| tree | 7f8e4148950561612212359e19dce88e5b4a7e76 | |
| parent | d6f9c1819f8d900fa247c93667024fea72fc153f (diff) | |
| download | perl-5518ecd4c71d9e274b4e6a0c6a7d04bade4a7cd9.tar.gz | |
Ultrix tweaks: <string.h> must not be included twice
(otherwise one gets prototype conflicts between the <string.h>
and proto.h because Ultrix thinks e.g. Perl_ninstr has been
define in <string.h>...); and Configure misprobes some features.
p4raw-id: //depot/perl@20916
| -rw-r--r-- | ext/POSIX/POSIX.xs | 2 | ||||
| -rw-r--r-- | ext/SDBM_File/sdbm/sdbm.c | 4 | ||||
| -rw-r--r-- | ext/SDBM_File/sdbm/sdbm.h | 6 | ||||
| -rw-r--r-- | ext/Socket/Socket.xs | 2 | ||||
| -rw-r--r-- | hints/ultrix_4.sh | 4 |
5 files changed, 14 insertions, 4 deletions
diff --git a/ext/POSIX/POSIX.xs b/ext/POSIX/POSIX.xs index d054ce98e1..54e087afff 100644 --- a/ext/POSIX/POSIX.xs +++ b/ext/POSIX/POSIX.xs @@ -61,7 +61,9 @@ #ifdef I_STDLIB #include <stdlib.h> #endif +#ifndef __ultrix__ #include <string.h> +#endif #include <sys/stat.h> #include <sys/types.h> #include <time.h> diff --git a/ext/SDBM_File/sdbm/sdbm.c b/ext/SDBM_File/sdbm/sdbm.c index 31889d97f3..a3c4acfb3d 100644 --- a/ext/SDBM_File/sdbm/sdbm.c +++ b/ext/SDBM_File/sdbm/sdbm.c @@ -24,7 +24,9 @@ #endif #ifdef I_STRING -# include <string.h> +# ifndef __ultrix__ +# include <string.h> +# endif #else # include <strings.h> #endif diff --git a/ext/SDBM_File/sdbm/sdbm.h b/ext/SDBM_File/sdbm/sdbm.h index 86ba82d82f..8405fea9a9 100644 --- a/ext/SDBM_File/sdbm/sdbm.h +++ b/ext/SDBM_File/sdbm/sdbm.h @@ -186,9 +186,11 @@ Free_t Perl_mfree proto((Malloc_t where)); #endif /* MYMALLOC */ #ifdef I_STRING -#include <string.h> +# ifndef __ultrix__ +# include <string.h> +# endif #else -#include <strings.h> +# include <strings.h> #endif #ifdef I_MEMORY diff --git a/ext/Socket/Socket.xs b/ext/Socket/Socket.xs index 139e9cb903..040dda4008 100644 --- a/ext/Socket/Socket.xs +++ b/ext/Socket/Socket.xs @@ -30,7 +30,7 @@ # if defined(__sgi) && !defined(AF_LINK) && defined(PF_LINK) && PF_LINK == AF_LNK # undef PF_LINK # endif -# ifdef I_NETINET_IN +# if defined(I_NETINET_IN) || defined(__ultrix__) # include <netinet/in.h> # endif # ifdef I_NETDB diff --git a/hints/ultrix_4.sh b/hints/ultrix_4.sh index 74d98aecc0..5954d24bf2 100644 --- a/hints/ultrix_4.sh +++ b/hints/ultrix_4.sh @@ -75,3 +75,7 @@ d_mkstemp='undef' # There simply isn't dynaloading in Ultrix. usedl='undef' +# There are <netinet/in.h> and gettimeofday(), +# despite of what Configure thinks. +i_niin='define' +d_gettimeod='define' |