cvs commit: apache/src conf.h httpd.h util.c

[Marc Slemko <ma...@hyperreal.org>]

marc        97/07/01 20:38:32

  Modified:    src       conf.h httpd.h util.c
  Log:
  Get rid of LESS_SLACK_JACK in favor of existing NO_SLACK and make
  minor change to NO_SLACK to optimize out the ap_slack() function
  entirely when NO_SLACK is defined.
  
  Revision  Changes    Path
  1.110     +1 -1      apache/src/conf.h
  
  Index: conf.h
  ===================================================================
  RCS file: /export/home/cvs/apache/src/conf.h,v
  retrieving revision 1.109
  retrieving revision 1.110
  diff -C3 -r1.109 -r1.110
  *** conf.h	1997/07/01 01:15:27	1.109
  --- conf.h	1997/07/02 03:38:30	1.110
  ***************
  *** 552,558 ****
    #define O_RDWR _O_RDWR
    #define SIGPIPE 17
    /* Seems Windows is not a subgenius */
  ! #define LESS_SLACK_JACK
    #include <stddef.h>
    /* Unknown system - Edit these to match */
    #else
  --- 552,558 ----
    #define O_RDWR _O_RDWR
    #define SIGPIPE 17
    /* Seems Windows is not a subgenius */
  ! #define NO_SLACK
    #include <stddef.h>
    /* Unknown system - Edit these to match */
    #else
  
  
  
  1.124     +1 -1      apache/src/httpd.h
  
  Index: httpd.h
  ===================================================================
  RCS file: /export/home/cvs/apache/src/httpd.h,v
  retrieving revision 1.123
  retrieving revision 1.124
  diff -C3 -r1.123 -r1.124
  *** httpd.h	1997/07/01 06:46:03	1.123
  --- httpd.h	1997/07/02 03:38:30	1.124
  ***************
  *** 773,779 ****
     * never fails.  If the high line was requested and it fails it will also try
     * the low line.
     */
  ! #ifdef LESS_SLACK_JACK
    #define ap_slack(fd,line)   (fd)
    #else
    int ap_slack (int fd, int line);
  --- 773,779 ----
     * never fails.  If the high line was requested and it fails it will also try
     * the low line.
     */
  ! #ifdef NO_SLACK
    #define ap_slack(fd,line)   (fd)
    #else
    int ap_slack (int fd, int line);
  
  
  
  1.60      +3 -3      apache/src/util.c
  
  Index: util.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/util.c,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -C3 -r1.59 -r1.60
  *** util.c	1997/06/30 22:50:41	1.59
  --- util.c	1997/07/02 03:38:30	1.60
  ***************
  *** 1391,1400 ****
    }
    #endif
    
  ! #ifndef LESS_SLACK_JACK
    int ap_slack (int fd, int line)
    {
  ! #if !defined(F_DUPFD) || defined(NO_SLACK)
        return fd;
    #else
        int new_fd;
  --- 1391,1400 ----
    }
    #endif
    
  ! #ifndef NO_SLACK
    int ap_slack (int fd, int line)
    {
  ! #if !defined(F_DUPFD)
        return fd;
    #else
        int new_fd;
  ***************
  *** 1420,1423 ****
        return new_fd;
    #endif
    }
  ! #endif /* LESS_SLACK_JACK */
  --- 1420,1423 ----
        return new_fd;
    #endif
    }
  ! #endif /* NO_SLACK */