httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Marc Slemko <ma...@znep.com>
Subject Re: Hitachi HI-UX/WE2, PATCH
Date Fri, 07 Feb 1997 06:58:20 GMT
(I'll test this on a HPUX 10.x system when I get time)

Note that we are getting reports that the int cast for select isn't needed
on recent HPUX versions.  Sigh.  

On Mon, 3 Feb 1997, Jim Jagielski wrote:

> *** buff.c.org	Sat Jan 25 22:37:10 1997
> --- buff.c	Thu Jan 30 14:22:57 1997
> ***************
> *** 423,429 ****
>   	FD_SET( fb->fd_in, &fds );
>   	tv.tv_sec = 0;
>   	tv.tv_usec = 0;
> ! #ifdef HPUX
>   	rv = select( fb->fd_in + 1, (int *)&fds, NULL, NULL, &tv );
>   #else
>   	rv = select( fb->fd_in + 1, &fds, NULL, NULL, &tv );
> --- 423,429 ----
>   	FD_SET( fb->fd_in, &fds );
>   	tv.tv_sec = 0;
>   	tv.tv_usec = 0;
> ! #ifdef HPUX_SELECT
>   	rv = select( fb->fd_in + 1, (int *)&fds, NULL, NULL, &tv );
>   #else
>   	rv = select( fb->fd_in + 1, &fds, NULL, NULL, &tv );
> *** conf.h.org	Sun Jan 26 21:17:10 1997
> --- conf.h	Wed Jan 29 15:59:34 1997
> ***************
> *** 95,100 ****
> --- 95,112 ----
>   #define HAVE_CRYPT_H
>   #define NO_LONG_DOUBLE
>   
> + #elif defined(HIUX)
> + #define HAVE_SYS_RESOURCE_H
> + #undef HAS_GMTOFF
> + #define NO_KILLPG
> + #undef NO_SETSID
> + #ifndef _HIUX_SOURCE
> + #define _HIUX_SOURCE
> + #endif
> + #define JMP_BUF sigjmp_buf
> + #define HAVE_SHMGET
> + #define HPUX_SELECT
> + 
>   #elif defined(HPUX) || defined(HPUX10)
>   #define HAVE_SYS_RESOURCE_H
>   #undef HAVE_GMTOFF
> ***************
> *** 103,114 ****
>   #ifndef _HPUX_SOURCE
>   #define _HPUX_SOURCE
>   #endif
> - #ifndef HPUX10
> - #define getwd(d) getcwd(d,MAX_STRING_LEN)
> - #endif
>   #define JMP_BUF sigjmp_buf
>   #define HAVE_SHMGET
>   #ifndef HPUX10
>   typedef int rlim_t;
>   #endif
>   
> --- 115,125 ----
>   #ifndef _HPUX_SOURCE
>   #define _HPUX_SOURCE
>   #endif
>   #define JMP_BUF sigjmp_buf
>   #define HAVE_SHMGET
> + #define HPUX_SELECT
>   #ifndef HPUX10
> + #define getwd(d) getcwd(d,MAX_STRING_LEN)
>   typedef int rlim_t;
>   #endif
>   
> *** Configure.org	Sat Jan 25 22:38:22 1997
> --- Configure	Wed Jan 29 18:40:12 1997
> ***************
> *** 196,206 ****
>   	LIBS="$LIBS -lsocket -llibufc -lbsd"
>   	DBM_LIB="-lgdbm"
>   	;;
>       *-hp-hpux10.*)
>   	OS='HP-UX 10'
>   	CFLAGS="$CFLAGS -DHPUX10"
>   	# if we're using the HPUX compiler, add a few flags.
> ! 	if [ "$CC" = "cc" ]; then
>   	    CFLAGS="$CFLAGS -Aa -D_HPUX_SOURCE"
>   	fi
>   	;;
> --- 196,214 ----
>   	LIBS="$LIBS -lsocket -llibufc -lbsd"
>   	DBM_LIB="-lgdbm"
>   	;;
> +     *-hi-hiux)
> + 	OS='HI-UX'
> + 	CFLAGS="$CFLAGS -DHIUX"
> + 	# if we're using the HIUX compiler, add a few flags.
> + 	if [ ! "$CC" -o "$CC" = "cc" ]; then
> + 	    CFLAGS="$CFLAGS -Aa -D_HIUX_SOURCE"
> + 	fi
> + 	;;
>       *-hp-hpux10.*)
>   	OS='HP-UX 10'
>   	CFLAGS="$CFLAGS -DHPUX10"
>   	# if we're using the HPUX compiler, add a few flags.
> ! 	if [ ! "$CC" -o "$CC" = "cc" ]; then
>   	    CFLAGS="$CFLAGS -Aa -D_HPUX_SOURCE"
>   	fi
>   	;;
> ***************
> *** 207,213 ****
>       *-hp-hpux*)
>   	OS='HP-UX'
>   	CFLAGS="$CFLAGS -DHPUX"
> ! 	if [ "$CC" = "cc" ]; then
>   	    CFLAGS="$CFLAGS -Aa -D_HPUX_SOURCE"
>   	fi
>   	;;
> --- 215,221 ----
>       *-hp-hpux*)
>   	OS='HP-UX'
>   	CFLAGS="$CFLAGS -DHPUX"
> ! 	if [ ! "$CC" -o "$CC" = "cc" ]; then
>   	    CFLAGS="$CFLAGS -Aa -D_HPUX_SOURCE"
>   	fi
>   	;;
> *** GuessOS.org	Sat Jan 25 22:58:29 1997
> --- GuessOS	Wed Jan 29 14:32:27 1997
> ***************
> *** 66,71 ****
> --- 66,75 ----
>   	echo "${MACHINE}-dg-dgux"; exit 0
>   	;;
>   
> +     HI-UX:*)
> + 	echo "${MACHINE}-hi-hiux"; exit 0
> + 	;;
> + 
>       HP-UX:*)
>   	HPUXVER=`echo ${RELEASE}|sed -e 's/[^.]*.[0B]*//'`
>   	case "$HPUXVER" in
> *** http_main.c.org	Sun Jan 26 21:11:53 1997
> --- http_main.c	Wed Jan 29 14:33:28 1997
> ***************
> *** 366,372 ****
>           fds_read   = fds;
>           fds_err    = fds;
>       
> ! #ifdef HPUX
>           select_rv = select(sd + 1, (int*)&fds_read, NULL, (int*)&fds_err, &tv);
>   #else
>           select_rv = select(sd + 1, &fds_read, NULL, &fds_err, &tv);
> --- 366,372 ----
>           fds_read   = fds;
>           fds_err    = fds;
>       
> ! #ifdef HPUX_SELECT
>           select_rv = select(sd + 1, (int*)&fds_read, NULL, (int*)&fds_err, &tv);
>   #else
>           select_rv = select(sd + 1, &fds_read, NULL, &fds_err, &tv);
> ***************
> *** 1586,1592 ****
>   
>   	    for (;;) {
>   		memcpy(&fds, &listenfds, sizeof(fd_set));
> ! #ifdef HPUX
>   		csd = select(listenmaxfd+1, (int*)&fds, NULL, NULL, NULL);
>   #else
>                   csd = select(listenmaxfd+1, &fds, NULL, NULL, NULL);
> --- 1586,1592 ----
>   
>   	    for (;;) {
>   		memcpy(&fds, &listenfds, sizeof(fd_set));
> ! #ifdef HPUX_SELECT
>   		csd = select(listenmaxfd+1, (int*)&fds, NULL, NULL, NULL);
>   #else
>                   csd = select(listenmaxfd+1, &fds, NULL, NULL, NULL);
> ***************
> *** 1617,1623 ****
>   	    do {
>                   FD_ZERO(&fds);
>                   FD_SET(sd,&fds);
> ! #ifdef HPUX
>   		csd = select(sd+1, (int*)&fds, NULL, NULL, NULL);
>   #else
>   		csd = select(sd+1, &fds, NULL, NULL, NULL);
> --- 1617,1623 ----
>   	    do {
>                   FD_ZERO(&fds);
>                   FD_SET(sd,&fds);
> ! #ifdef HPUX_SELECT
>   		csd = select(sd+1, (int*)&fds, NULL, NULL, NULL);
>   #else
>   		csd = select(sd+1, &fds, NULL, NULL, NULL);
> 
> 
> 
> -- 
> ====================================================================
>       Jim Jagielski            |       jaguNET Access Services
>      jim@jaguNET.com           |       http://www.jaguNET.com/
>                   "Not the Craw... the CRAW!"
> 


Mime
View raw message