You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by Brian Behlendorf <br...@hyperreal.com> on 1997/01/10 12:43:10 UTC

cvs commit: apache/src util.c

brian       97/01/10 03:43:09

  Modified:    src       util.c
  Log:
  Reviewed by:	Brian Behlendorf
  Submitted by:	Martin Zimmerman <ca...@wooga.cuug.ab.ca>
  
  Removed QNX-specific lines which were causing conflicts.
  
  Revision  Changes    Path
  1.39      +0 -10     apache/src/util.c
  
  Index: util.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/util.c,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -C3 -r1.38 -r1.39
  *** util.c	1997/01/01 18:10:44	1.38
  --- util.c	1997/01/10 11:43:08	1.39
  ***************
  *** 197,207 ****
     * AT&T V8 regexp package.
     */
    
  - #ifdef QNX
  - # define rm_so	rm_sp
  - # define rm_eo	rm_ep
  - #endif
  - 
    char *pregsub(pool *p, const char *input, const char *source,
    	      size_t nmatch, regmatch_t pmatch[]) {
        const char *src = input;
  --- 197,202 ----
  ***************
  *** 265,275 ****
        
        return dest;
    }
  - 
  - #ifdef QNX
  - # undef rm_so
  - # undef rm_eo
  - #endif
    
    /*
     * Parse .. so we don't compromise security
  --- 260,265 ----