httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jim Jagielski <...@hyperreal.com>
Subject cvs commit: apache/src/helpers GuessOS
Date Mon, 10 Feb 1997 21:22:25 GMT
jim         97/02/10 13:22:24

  Modified:    src       Configure buff.c conf.h http_main.c
               src/helpers  GuessOS
  Log:
  Add HI-UX support
  
  Revision  Changes    Path
  1.77      +10 -2     apache/src/Configure
  
  Index: Configure
  ===================================================================
  RCS file: /export/home/cvs/apache/src/Configure,v
  retrieving revision 1.76
  retrieving revision 1.77
  diff -C3 -r1.76 -r1.77
  *** Configure	1997/02/06 14:09:55	1.76
  --- Configure	1997/02/10 21:22:19	1.77
  ***************
  *** 202,219 ****
    	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
    	;;
        *-hp-hpux*)
    	OS='HP-UX'
    	CFLAGS="$CFLAGS -DHPUX"
  ! 	if [ "$CC" = "cc" ]; then
    	    CFLAGS="$CFLAGS -Aa -D_HPUX_SOURCE"
    	fi
    	;;
  --- 202,227 ----
    	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
    	;;
        *-hp-hpux*)
    	OS='HP-UX'
    	CFLAGS="$CFLAGS -DHPUX"
  ! 	if [ ! "$CC" -o "$CC" = "cc" ]; then
    	    CFLAGS="$CFLAGS -Aa -D_HPUX_SOURCE"
    	fi
    	;;
  
  
  
  1.18      +1 -1      apache/src/buff.c
  
  Index: buff.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/buff.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -C3 -r1.17 -r1.18
  *** buff.c	1997/02/10 15:49:54	1.17
  --- buff.c	1997/02/10 21:22:19	1.18
  ***************
  *** 305,311 ****
    	    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 );
  --- 305,311 ----
    	    FD_SET( fb->fd_in, &fds );
    	    tv.tv_sec = 0;
    	    tv.tv_usec = 0;
  ! #ifdef SELECT_NEEDS_CAST
    	    rv = select( fb->fd_in + 1, (int *)&fds, NULL, NULL, &tv );
    #else
    	    rv = select( fb->fd_in + 1, &fds, NULL, NULL, &tv );
  
  
  
  1.78      +18 -7     apache/src/conf.h
  
  Index: conf.h
  ===================================================================
  RCS file: /export/home/cvs/apache/src/conf.h,v
  retrieving revision 1.77
  retrieving revision 1.78
  diff -C3 -r1.77 -r1.78
  *** conf.h	1997/02/10 00:40:08	1.77
  --- conf.h	1997/02/10 21:22:20	1.78
  ***************
  *** 110,115 ****
  --- 110,127 ----
    #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 SELECT_NEEDS_CAST
  + 
    #elif defined(HPUX) || defined(HPUX10)
    #define HAVE_SYS_RESOURCE_H
    #undef HAVE_GMTOFF
  ***************
  *** 118,129 ****
    #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
    
  --- 130,140 ----
    #ifndef _HPUX_SOURCE
    #define _HPUX_SOURCE
    #endif
    #define JMP_BUF sigjmp_buf
    #define HAVE_SHMGET
    #ifndef HPUX10
  + #define SELECT_NEEDS_CAST
  + #define getwd(d) getcwd(d,MAX_STRING_LEN)
    typedef int rlim_t;
    #endif
    
  ***************
  *** 283,292 ****
    extern int accept(), gethostname(), connect(), lstat();
    extern int select(), killpg(), shutdown();
    extern int initgroups(), setsockopt();
  ! extern char *shmat(int, char *, int);
  ! extern int  shmctl(int, int, struct shmid_ds *);
  ! extern int  shmget(key_t, int, int);
  ! extern char *sbrk(int);
    extern char *crypt();
    extern char *getwd();
    #include <sys/time.h>
  --- 294,303 ----
    extern int accept(), gethostname(), connect(), lstat();
    extern int select(), killpg(), shutdown();
    extern int initgroups(), setsockopt();
  ! extern char *shmat();
  ! extern int  shmctl();
  ! extern int  shmget();
  ! extern char *sbrk();
    extern char *crypt();
    extern char *getwd();
    #include <sys/time.h>
  
  
  
  1.118     +3 -3      apache/src/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_main.c,v
  retrieving revision 1.117
  retrieving revision 1.118
  diff -C3 -r1.117 -r1.118
  *** http_main.c	1997/02/10 00:40:08	1.117
  --- http_main.c	1997/02/10 21:22:20	1.118
  ***************
  *** 359,365 ****
            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);
  --- 359,365 ----
            fds_read   = fds;
            fds_err    = fds;
        
  ! #ifdef SELECT_NEEDS_CAST
            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);
  ***************
  *** 1598,1604 ****
    
    	    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);
  --- 1598,1604 ----
    
    	    for (;;) {
    		memcpy(&fds, &listenfds, sizeof(fd_set));
  ! #ifdef SELECT_NEEDS_CAST
    		csd = select(listenmaxfd+1, (int*)&fds, NULL, NULL, NULL);
    #else
                    csd = select(listenmaxfd+1, &fds, NULL, NULL, NULL);
  ***************
  *** 1629,1635 ****
    	    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);
  --- 1629,1635 ----
    	    do {
                    FD_ZERO(&fds);
                    FD_SET(sd,&fds);
  ! #ifdef SELECT_NEEDS_CAST
    		csd = select(sd+1, (int*)&fds, NULL, NULL, NULL);
    #else
    		csd = select(sd+1, &fds, NULL, NULL, NULL);
  
  
  
  1.17      +4 -0      apache/src/helpers/GuessOS
  
  Index: GuessOS
  ===================================================================
  RCS file: /export/home/cvs/apache/src/helpers/GuessOS,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -C3 -r1.16 -r1.17
  *** GuessOS	1997/01/25 22:58:29	1.16
  --- GuessOS	1997/02/10 21:22:23	1.17
  ***************
  *** 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
  
  
  

Mime
View raw message