You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@hyperreal.org on 1998/01/21 18:12:42 UTC

cvs commit: apachen/src/ap ap.h

coar        98/01/21 09:12:41

  Modified:    src      Configure
  Added:       src/ap   ap.h
  Log:
  	Add header file for httpd-independent (libap) routines, and
  	awareness of src/ap as an include directory.
  
  Revision  Changes    Path
  1.177     +1 -1      apachen/src/Configure
  
  Index: Configure
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/Configure,v
  retrieving revision 1.176
  retrieving revision 1.177
  diff -u -r1.176 -r1.177
  --- Configure	1998/01/13 23:11:04	1.176
  +++ Configure	1998/01/21 17:12:34	1.177
  @@ -991,7 +991,7 @@
   echo "CFLAGS1=$CFLAGS">> Makefile.config
   echo "INCLUDES1=$INCLUDES">> Makefile.config
   
  -INCLUDES_AUTODEPTH="$INCLUDES_AUTODEPTH $OSDIR main"
  +INCLUDES_AUTODEPTH="$INCLUDES_AUTODEPTH $OSDIR main ap"
   incprefix="-I"
   for depth in 0 1 2; do
       incvar="INCLUDES_DEPTH${depth}="
  
  
  
  1.1                  apachen/src/ap/ap.h
  
  Index: ap.h
  ===================================================================
  /* ====================================================================
   * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer. 
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. All advertising materials mentioning features or use of this
   *    software must display the following acknowledgment:
   *    "This product includes software developed by the Apache Group
   *    for use in the Apache HTTP server project (http://www.apache.org/)."
   *
   * 4. The names "Apache Server" and "Apache Group" must not be used to
   *    endorse or promote products derived from this software without
   *    prior written permission. For written permission, please contact
   *    apache@apache.org.
   *
   * 5. Redistributions of any form whatsoever must retain the following
   *    acknowledgment:
   *    "This product includes software developed by the Apache Group
   *    for use in the Apache HTTP server project (http://www.apache.org/)."
   *
   * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
   * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
   * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
   * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
   * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
   * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
   * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
   * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
   * OF THE POSSIBILITY OF SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Group and was originally based
   * on public domain software written at the National Center for
   * Supercomputing Applications, University of Illinois, Urbana-Champaign.
   * For more information on the Apache Group and the Apache HTTP server
   * project, please see <http://www.apache.org/>.
   *
   * This code is based on, and used with the permission of, the
   * SIO stdio-replacement strx_* functions by Panos Tsirigotis
   * <pa...@alumni.cs.colorado.edu> for xinetd.
   */
  
  #ifndef _AP_H
  #define _AP_H
  
  API_EXPORT(char *) ap_cpystrn(char *, const char *, size_t);
  int ap_slack(int, int);
  API_EXPORT(char *) ap_escape_quotes(pool *, const char *);
  API_EXPORT(int) ap_snprintf(char *, size_t, const char *, ...);
  API_EXPORT(int) ap_vsnprintf(char *, size_t, const char *, va_list ap);
  
  #endif
  
  
  

Re: cvs commit: apachen/src/ap ap.h

Posted by Marc Slemko <ma...@worldgate.com>.
On Thu, 22 Jan 1998, Rodent of Unusual Size wrote:

> I see what you mean.  Does this patch fix all the problems?  I've hit
> the .mak files that mentioned httpd.h, but aren't they driven from
> the .dsp files?
> 
> If this does the trick, let me know and I'll commit it..  The least I
> can do after making Win32 uncompilable.

The .mak files are generated from the .dsp stuff, so there is no point in
changing them.  I think.  Changing the .dsps (which someone said can be
done globally?  Ahhh... ok, it isn't all one project so it probably can't)
then exporting is probably what we want.

I think.



Re: cvs commit: apachen/src/ap ap.h

Posted by Rodent of Unusual Size <Ke...@Golux.Com>.
I see what you mean.  Does this patch fix all the problems?  I've hit
the .mak files that mentioned httpd.h, but aren't they driven from
the .dsp files?

If this does the trick, let me know and I'll commit it..  The least I
can do after making Win32 uncompilable.

#ken	P-)}


Index: src/ApacheCore.mak
===================================================================
RCS file: /export/home/cvs/apachen/src/ApacheCore.mak,v
retrieving revision 1.26
diff -u -r1.26 ApacheCore.mak
--- ApacheCore.mak      1998/01/04 13:06:09     1.26
+++ ApacheCore.mak      1998/01/22 21:53:30
@@ -447,6 +447,7 @@
        ".\main\conf.h"\
        ".\main\http_log.h"\
        ".\main\httpd.h"\
+       ".\ap\ap.h"\
        ".\main\multithread.h"\
        ".\os\win32\os.h"\
        ".\os\win32\readdir.h"\
@@ -484,6 +485,7 @@
        ".\main\http_log.h"\
        ".\main\http_main.h"\
        ".\main\httpd.h"\
+       ".\ap\ap.h"\
        ".\os\win32\os.h"\
        ".\os\win32\readdir.h"\
        ".\regex\regex.h"\
@@ -535,6 +537,7 @@
        ".\main\conf.h"\
        ".\main\explain.h"\
        ".\main\httpd.h"\
+       ".\ap\ap.h"\
        ".\os\win32\os.h"\
        ".\os\win32\readdir.h"\
        ".\regex\regex.h"\
@@ -609,6 +612,7 @@
        ".\main\buff.h"\
        ".\main\conf.h"\
        ".\main\httpd.h"\
+       ".\ap\ap.h"\
        ".\os\win32\os.h"\
        ".\os\win32\readdir.h"\
        ".\regex\regex.h"\
@@ -650,6 +654,7 @@
        ".\main\http_request.h"\
        ".\main\http_vhost.h"\
        ".\main\httpd.h"\
+       ".\ap\ap.h"\
        ".\os\win32\os.h"\
        ".\os\win32\readdir.h"\
        ".\regex\regex.h"\
@@ -693,6 +698,7 @@
        ".\main\http_request.h"\
        ".\main\http_vhost.h"\
        ".\main\httpd.h"\
+       ".\ap\ap.h"\
        ".\main\md5.h"\
        ".\main\rfc1413.h"\
        ".\main\scoreboard.h"\
@@ -735,6 +741,7 @@
        ".\main\http_log.h"\
        ".\main\http_main.h"\
        ".\main\httpd.h"\
+       ".\ap\ap.h"\
        ".\os\win32\os.h"\
        ".\os\win32\readdir.h"\
        ".\regex\regex.h"\
@@ -778,6 +785,7 @@
        ".\main\http_request.h"\
        ".\main\http_vhost.h"\
        ".\main\httpd.h"\
+       ".\ap\ap.h"\
        ".\main\multithread.h"\
        ".\main\scoreboard.h"\
        ".\os\win32\getopt.h"\
@@ -824,6 +832,7 @@
        ".\main\http_request.h"\
        ".\main\http_vhost.h"\
        ".\main\httpd.h"\
+       ".\ap\ap.h"\
        ".\main\util_date.h"\
        ".\os\win32\os.h"\
        ".\os\win32\readdir.h"\
@@ -866,6 +875,7 @@
        ".\main\http_protocol.h"\
        ".\main\http_request.h"\
        ".\main\httpd.h"\
+       ".\ap\ap.h"\
        ".\main\scoreboard.h"\
        ".\os\win32\os.h"\
        ".\os\win32\readdir.h"\
@@ -906,6 +916,7 @@
        ".\main\http_protocol.h"\
        ".\main\http_vhost.h"\
        ".\main\httpd.h"\
+       ".\ap\ap.h"\
        ".\os\win32\os.h"\
        ".\os\win32\readdir.h"\
        ".\regex\regex.h"\
@@ -974,6 +985,7 @@
        ".\main\http_log.h"\
        ".\main\http_request.h"\
        ".\main\httpd.h"\
+       ".\ap\ap.h"\
        ".\os\win32\os.h"\
        ".\os\win32\readdir.h"\
        ".\regex\regex.h"\
@@ -1014,6 +1026,7 @@
        ".\main\http_protocol.h"\
        ".\main\http_request.h"\
        ".\main\httpd.h"\
+       ".\ap\ap.h"\
        ".\main\util_script.h"\
        ".\os\win32\os.h"\
        ".\os\win32\readdir.h"\
@@ -1050,6 +1063,7 @@
        ".\main\conf.h"\
        ".\main\http_config.h"\
        ".\main\httpd.h"\
+       ".\ap\ap.h"\
        ".\os\win32\os.h"\
        ".\os\win32\readdir.h"\
        ".\regex\regex.h"\
@@ -1089,6 +1103,7 @@
        ".\main\http_protocol.h"\
        ".\main\http_request.h"\
        ".\main\httpd.h"\
+       ".\ap\ap.h"\
        ".\main\util_script.h"\
        ".\os\win32\os.h"\
        ".\os\win32\readdir.h"\
@@ -1128,6 +1143,7 @@
        ".\main\http_log.h"\
        ".\main\http_protocol.h"\
        ".\main\httpd.h"\
+       ".\ap\ap.h"\
        ".\os\win32\os.h"\
        ".\os\win32\readdir.h"\
        ".\regex\regex.h"\
@@ -1168,6 +1184,7 @@
        ".\main\http_protocol.h"\
        ".\main\http_request.h"\
        ".\main\httpd.h"\
+       ".\ap\ap.h"\
        ".\main\util_script.h"\
        ".\os\win32\os.h"\
        ".\os\win32\readdir.h"\
@@ -1210,6 +1227,7 @@
        ".\main\http_protocol.h"\
        ".\main\http_request.h"\
        ".\main\httpd.h"\
+       ".\ap\ap.h"\
        ".\main\util_script.h"\
        ".\os\win32\os.h"\
        ".\os\win32\readdir.h"\
@@ -1251,6 +1269,7 @@
        ".\main\http_protocol.h"\
        ".\main\http_request.h"\
        ".\main\httpd.h"\
+       ".\ap\ap.h"\
        ".\main\util_script.h"\
        ".\os\win32\os.h"\
        ".\os\win32\readdir.h"\
@@ -1287,6 +1306,7 @@
        ".\main\conf.h"\
        ".\main\http_config.h"\
        ".\main\httpd.h"\
+       ".\ap\ap.h"\
        ".\os\win32\os.h"\
        ".\os\win32\readdir.h"\
        ".\regex\regex.h"\
@@ -1321,6 +1341,7 @@
        ".\main\conf.h"\
        ".\main\http_config.h"\
        ".\main\httpd.h"\
+       ".\ap\ap.h"\
        ".\os\win32\os.h"\
        ".\os\win32\readdir.h"\
        ".\regex\regex.h"\
@@ -1361,6 +1382,7 @@
        ".\main\http_protocol.h"\
        ".\main\http_request.h"\
        ".\main\httpd.h"\
+       ".\ap\ap.h"\
        ".\main\util_script.h"\
        ".\os\win32\os.h"\
        ".\os\win32\readdir.h"\
@@ -1402,6 +1424,7 @@
        ".\main\http_protocol.h"\
        ".\main\http_request.h"\
        ".\main\httpd.h"\
+       ".\ap\ap.h"\
        ".\main\util_script.h"\
        ".\os\win32\os.h"\
        ".\os\win32\readdir.h"\
@@ -1444,6 +1467,7 @@
        ".\main\http_protocol.h"\
        ".\main\http_request.h"\
        ".\main\httpd.h"\
+       ".\ap\ap.h"\
        ".\main\util_script.h"\
        ".\os\win32\os.h"\
        ".\os\win32\readdir.h"\
@@ -1481,6 +1505,7 @@
        ".\main\http_core.h"\
        ".\main\http_log.h"\
        ".\main\httpd.h"\
+       ".\ap\ap.h"\
        ".\os\win32\os.h"\
        ".\os\win32\readdir.h"\
        ".\regex\regex.h"\
@@ -1516,6 +1541,7 @@
        ".\main\conf.h"\
        ".\main\http_config.h"\
        ".\main\httpd.h"\
+       ".\ap\ap.h"\
        ".\modules\standard\mod_mime.h"\
        ".\os\win32\os.h"\
        ".\os\win32\readdir.h"\
@@ -1555,6 +1581,7 @@
        ".\main\http_log.h"\
        ".\main\http_request.h"\
        ".\main\httpd.h"\
+       ".\ap\ap.h"\
        ".\main\util_script.h"\
        ".\os\win32\os.h"\
        ".\os\win32\readdir.h"\
@@ -1593,6 +1620,7 @@
        ".\main\http_core.h"\
        ".\main\http_log.h"\
        ".\main\httpd.h"\
+       ".\ap\ap.h"\
        ".\os\win32\os.h"\
        ".\os\win32\readdir.h"\
        ".\regex\regex.h"\
@@ -1628,6 +1656,7 @@
        ".\main\conf.h"\
        ".\main\http_config.h"\
        ".\main\httpd.h"\
+       ".\ap\ap.h"\
        ".\os\win32\os.h"\
        ".\os\win32\readdir.h"\
        ".\regex\regex.h"\
@@ -1663,6 +1692,7 @@
        ".\main\conf.h"\
        ".\main\http_config.h"\
        ".\main\httpd.h"\
+       ".\ap\ap.h"\
        ".\os\win32\os.h"\
        ".\os\win32\readdir.h"\
        ".\regex\regex.h"\
@@ -1748,6 +1778,7 @@
        ".\main\http_log.h"\
        ".\main\http_main.h"\
        ".\main\httpd.h"\
+       ".\ap\ap.h"\
        ".\main\rfc1413.h"\
        ".\os\win32\os.h"\
        ".\os\win32\readdir.h"\
@@ -1813,6 +1844,7 @@
        ".\main\http_conf_globals.h"\
        ".\main\http_log.h"\
        ".\main\httpd.h"\
+       ".\ap\ap.h"\
        ".\os\win32\os.h"\
        ".\os\win32\readdir.h"\
        ".\regex\regex.h"\
@@ -1877,6 +1909,7 @@
        ".\main\buff.h"\
        ".\main\conf.h"\
        ".\main\httpd.h"\
+       ".\ap\ap.h"\
        ".\main\md5.h"\
        ".\main\util_md5.h"\
        ".\os\win32\os.h"\
@@ -1920,6 +1953,7 @@
        ".\main\http_protocol.h"\
        ".\main\http_request.h"\
        ".\main\httpd.h"\
+       ".\ap\ap.h"\
        ".\main\util_date.h"\
        ".\main\util_script.h"\
        ".\os\win32\os.h"\
@@ -1956,6 +1990,7 @@
        ".\main\buff.h"\
        ".\main\conf.h"\
        ".\main\httpd.h"\
+       ".\ap\ap.h"\
        ".\os\win32\os.h"\
        ".\os\win32\readdir.h"\
        ".\regex\regex.h"\
Index: src/modules/proxy/ApacheModuleProxy.mak
===================================================================
RCS file: /export/home/cvs/apachen/src/modules/proxy/ApacheModuleProxy.mak,v
retrieving revision 1.6
diff -u -r1.6 ApacheModuleProxy.mak
--- ApacheModuleProxy.mak       1998/01/04 13:20:41     1.6
+++ ApacheModuleProxy.mak       1998/01/22 21:53:40
@@ -209,6 +209,7 @@
        "..\..\main\http_log.h"\
        "..\..\main\http_protocol.h"\
        "..\..\main\httpd.h"\
+       "..\..\ap\ap.h"\
        "..\..\os\win32\os.h"\
        "..\..\os\win32\readdir.h"\
        "..\..\regex\regex.h"\
@@ -229,6 +230,7 @@
        "..\..\main\http_log.h"\
        "..\..\main\http_protocol.h"\
        "..\..\main\httpd.h"\
+       "..\..\ap\ap.h"\
        "..\..\os\win32\os.h"\
        "..\..\os\win32\readdir.h"\
        "..\..\regex\regex.h"\
@@ -260,6 +262,7 @@
        "..\..\main\http_main.h"\
        "..\..\main\http_protocol.h"\
        "..\..\main\httpd.h"\
+       "..\..\ap\ap.h"\
        "..\..\main\md5.h"\
        "..\..\main\multithread.h"\
        "..\..\main\util_date.h"\
@@ -284,6 +287,7 @@
        "..\..\main\http_main.h"\
        "..\..\main\http_protocol.h"\
        "..\..\main\httpd.h"\
+       "..\..\ap\ap.h"\
        "..\..\main\md5.h"\
        "..\..\main\multithread.h"\
        "..\..\main\util_date.h"\
@@ -319,6 +323,7 @@
        "..\..\main\http_main.h"\
        "..\..\main\http_protocol.h"\
        "..\..\main\httpd.h"\
+       "..\..\ap\ap.h"\
        "..\..\os\win32\os.h"\
        "..\..\os\win32\readdir.h"\
        "..\..\regex\regex.h"\
@@ -340,6 +345,7 @@
        "..\..\main\http_main.h"\
        "..\..\main\http_protocol.h"\
        "..\..\main\httpd.h"\
+       "..\..\ap\ap.h"\
        "..\..\os\win32\os.h"\
        "..\..\os\win32\readdir.h"\
        "..\..\regex\regex.h"\
@@ -370,6 +376,7 @@
        "..\..\main\http_main.h"\
        "..\..\main\http_protocol.h"\
        "..\..\main\httpd.h"\
+       "..\..\ap\ap.h"\
        "..\..\os\win32\os.h"\
        "..\..\os\win32\readdir.h"\
        "..\..\regex\regex.h"\
@@ -391,6 +398,7 @@
        "..\..\main\http_main.h"\
        "..\..\main\http_protocol.h"\
        "..\..\main\httpd.h"\
+       "..\..\ap\ap.h"\
        "..\..\os\win32\os.h"\
        "..\..\os\win32\readdir.h"\
        "..\..\regex\regex.h"\
@@ -423,6 +431,7 @@
        "..\..\main\http_main.h"\
        "..\..\main\http_protocol.h"\
        "..\..\main\httpd.h"\
+       "..\..\ap\ap.h"\
        "..\..\main\util_date.h"\
        "..\..\os\win32\os.h"\
        "..\..\os\win32\readdir.h"\
@@ -445,6 +454,7 @@
        "..\..\main\http_main.h"\
        "..\..\main\http_protocol.h"\
        "..\..\main\httpd.h"\
+       "..\..\ap\ap.h"\
        "..\..\main\util_date.h"\
        "..\..\os\win32\os.h"\
        "..\..\os\win32\readdir.h"\
@@ -477,6 +487,7 @@
        "..\..\main\http_main.h"\
        "..\..\main\http_protocol.h"\
        "..\..\main\httpd.h"\
+       "..\..\ap\ap.h"\
        "..\..\main\md5.h"\
        "..\..\main\multithread.h"\
        "..\..\os\win32\os.h"\
@@ -500,6 +511,7 @@
        "..\..\main\http_main.h"\
        "..\..\main\http_protocol.h"\
        "..\..\main\httpd.h"\
+       "..\..\ap\ap.h"\
        "..\..\main\md5.h"\
        "..\..\main\multithread.h"\
        "..\..\os\win32\os.h"\
Index: src/os/win32/ApacheModuleAuthAnon.mak
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleAuthAnon.mak,v
retrieving revision 1.7
diff -u -r1.7 ApacheModuleAuthAnon.mak
--- ApacheModuleAuthAnon.mak    1997/10/20 20:19:14     1.7
+++ ApacheModuleAuthAnon.mak    1998/01/22 21:53:59
@@ -190,6 +190,7 @@
        "..\..\main\http_protocol.h"\
        "..\..\main\http_request.h"\
        "..\..\main\httpd.h"\
+       "..\..\ap\ap.h"\
        "..\..\regex\regex.h"\
        ".\os.h"\
        ".\readdir.h"\
@@ -211,6 +212,7 @@
        "..\..\main\http_protocol.h"\
        "..\..\main\http_request.h"\
        "..\..\main\httpd.h"\
+       "..\..\ap\ap.h"\
        "..\..\regex\regex.h"\
        ".\os.h"\
        ".\readdir.h"\
Index: src/os/win32/ApacheModuleCERNMeta.mak
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleCERNMeta.mak,v
retrieving revision 1.7
diff -u -r1.7 ApacheModuleCERNMeta.mak
--- ApacheModuleCERNMeta.mak    1997/10/20 20:19:17     1.7
+++ ApacheModuleCERNMeta.mak    1998/01/22 21:54:08
@@ -188,6 +188,7 @@
        "..\..\main\http_log.h"\
        "..\..\main\http_request.h"\
        "..\..\main\httpd.h"\
+       "..\..\ap\ap.h"\
        "..\..\main\util_script.h"\
        "..\..\regex\regex.h"\
        ".\os.h"\
@@ -208,6 +209,7 @@
        "..\..\main\http_log.h"\
        "..\..\main\http_request.h"\
        "..\..\main\httpd.h"\
+       "..\..\ap\ap.h"\
        "..\..\main\util_script.h"\
        "..\..\regex\regex.h"\
        ".\os.h"\
Index: src/os/win32/ApacheModuleDigest.mak
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleDigest.mak,v
retrieving revision 1.7
diff -u -r1.7 ApacheModuleDigest.mak
--- ApacheModuleDigest.mak      1997/10/20 20:19:18     1.7
+++ ApacheModuleDigest.mak      1998/01/22 21:54:17
@@ -189,6 +189,7 @@
        "..\..\main\http_log.h"\
        "..\..\main\http_protocol.h"\
        "..\..\main\httpd.h"\
+       "..\..\ap\ap.h"\
        "..\..\main\md5.h"\
        "..\..\main\util_md5.h"\
        "..\..\regex\regex.h"\
@@ -211,6 +212,7 @@
        "..\..\main\http_log.h"\
        "..\..\main\http_protocol.h"\
        "..\..\main\httpd.h"\
+       "..\..\ap\ap.h"\
        "..\..\main\md5.h"\
        "..\..\main\util_md5.h"\
        "..\..\regex\regex.h"\
Index: src/os/win32/ApacheModuleExpires.mak
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleExpires.mak,v
retrieving revision 1.7
diff -u -r1.7 ApacheModuleExpires.mak
--- ApacheModuleExpires.mak     1997/10/20 20:19:20     1.7
+++ ApacheModuleExpires.mak     1998/01/22 21:54:25
@@ -187,6 +187,7 @@
        "..\..\main\http_config.h"\
        "..\..\main\http_log.h"\
        "..\..\main\httpd.h"\
+       "..\..\ap\ap.h"\
        "..\..\regex\regex.h"\
        ".\os.h"\
        ".\readdir.h"\
@@ -205,6 +206,7 @@
        "..\..\main\http_config.h"\
        "..\..\main\http_log.h"\
        "..\..\main\httpd.h"\
+       "..\..\ap\ap.h"\
        "..\..\regex\regex.h"\
        ".\os.h"\
        ".\readdir.h"\
Index: src/os/win32/ApacheModuleHeaders.mak
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleHeaders.mak,v
retrieving revision 1.7
diff -u -r1.7 ApacheModuleHeaders.mak
--- ApacheModuleHeaders.mak     1997/10/20 20:19:23     1.7
+++ ApacheModuleHeaders.mak     1998/01/22 21:54:32
@@ -186,6 +186,7 @@
        "..\..\main\conf.h"\
        "..\..\main\http_config.h"\
        "..\..\main\httpd.h"\
+       "..\..\ap\ap.h"\
        "..\..\regex\regex.h"\
        ".\os.h"\
        ".\readdir.h"\
@@ -203,6 +204,7 @@
        "..\..\main\conf.h"\
        "..\..\main\http_config.h"\
        "..\..\main\httpd.h"\
+       "..\..\ap\ap.h"\
        "..\..\regex\regex.h"\
        ".\os.h"\
        ".\readdir.h"\
Index: src/os/win32/ApacheModuleInfo.mak
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleInfo.mak,v
retrieving revision 1.4
diff -u -r1.4 ApacheModuleInfo.mak
--- ApacheModuleInfo.mak        1997/10/20 20:19:24     1.4
+++ ApacheModuleInfo.mak        1998/01/22 21:54:39
@@ -186,6 +186,7 @@
        "..\..\main\http_main.h"\
        "..\..\main\http_protocol.h"\
        "..\..\main\httpd.h"\
+       "..\..\ap\ap.h"\
        "..\..\main\os-inline.c"\
        "..\..\main\os.h"\
        "..\..\main\util_script.h"\
Index: src/os/win32/ApacheModuleRewrite.mak
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleRewrite.mak,v
retrieving revision 1.6
diff -u -r1.6 ApacheModuleRewrite.mak
--- ApacheModuleRewrite.mak     1997/10/20 20:19:25     1.6
+++ ApacheModuleRewrite.mak     1998/01/22 21:54:47
@@ -195,6 +195,7 @@
        "..\..\main\http_log.h"\
        "..\..\main\http_request.h"\
        "..\..\main\httpd.h"\
+       "..\..\ap\ap.h"\
        "..\..\modules\standard\mod_rewrite.h"\
        "..\..\regex\regex.h"\
        ".\os.h"\
@@ -217,6 +218,7 @@
        "..\..\main\http_log.h"\
        "..\..\main\http_request.h"\
        "..\..\main\httpd.h"\
+       "..\..\ap\ap.h"\
        "..\..\modules\standard\mod_rewrite.h"\
        "..\..\regex\regex.h"\
        ".\os.h"\
Index: src/os/win32/ApacheModuleStatus.mak
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleStatus.mak,v
retrieving revision 1.7
diff -u -r1.7 ApacheModuleStatus.mak
--- ApacheModuleStatus.mak      1997/10/20 20:19:27     1.7
+++ ApacheModuleStatus.mak      1998/01/22 21:54:55
@@ -190,6 +190,7 @@
        "..\..\main\http_main.h"\
        "..\..\main\http_protocol.h"\
        "..\..\main\httpd.h"\
+       "..\..\ap\ap.h"\
        "..\..\main\scoreboard.h"\
        "..\..\main\util_script.h"\
        "..\..\regex\regex.h"\
@@ -213,6 +214,7 @@
        "..\..\main\http_main.h"\
        "..\..\main\http_protocol.h"\
        "..\..\main\httpd.h"\
+       "..\..\ap\ap.h"\
        "..\..\main\scoreboard.h"\
        "..\..\main\util_script.h"\
        "..\..\regex\regex.h"\
Index: src/os/win32/ApacheModuleUserTrack.mak
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleUserTrack.mak,v
retrieving revision 1.7
diff -u -r1.7 ApacheModuleUserTrack.mak
--- ApacheModuleUserTrack.mak   1997/10/20 20:19:27     1.7
+++ ApacheModuleUserTrack.mak   1998/01/22 21:55:04
@@ -187,6 +187,7 @@
        "..\..\main\http_config.h"\
        "..\..\main\http_core.h"\
        "..\..\main\httpd.h"\
+       "..\..\ap\ap.h"\
        "..\..\regex\regex.h"\
        ".\os.h"\
        ".\readdir.h"\
@@ -205,6 +206,7 @@
        "..\..\main\http_config.h"\
        "..\..\main\http_core.h"\
        "..\..\main\httpd.h"\
+       "..\..\ap\ap.h"\
        "..\..\regex\regex.h"\
        ".\os.h"\
        ".\readdir.h"\

Re: cvs commit: apachen/src/ap ap.h

Posted by Dean Gaudet <dg...@arctic.org>.
Why don't we create src/include and move all the .h files there?  Then we
don't have to deal with this again. 

Dean

On Thu, 22 Jan 1998, Ben Laurie wrote:

> Rodent of Unusual Size wrote:
> > 
> > Ben Laurie wrote:
> > >
> > > coar@hyperreal.org wrote:
> > > >
> > > >   -INCLUDES_AUTODEPTH="$INCLUDES_AUTODEPTH $OSDIR main"
> > > >   +INCLUDES_AUTODEPTH="$INCLUDES_AUTODEPTH $OSDIR main ap"
> > >
> > > The only way (that I'm aware of) to make this work in Win32 is to edit
> > > _every_ makefile. Either find a way to do it without so much effort, or
> > > make the path explicit where you include the file.
> > 
> > Humm.  Well, I think we need a Win32 Configure as part of the
> > source package that will do this.  If I had an NT box handy I'd
> > give this a try..  Noted.
> 
> Umm. In the meantime we can't compile Win32.
> 
> Cheers,
> 
> Ben.
> 
> -- 
> Ben Laurie            |Phone: +44 (181) 735 0686|Apache Group member
> Freelance Consultant  |Fax:   +44 (181) 735 0689|http://www.apache.org
> and Technical Director|Email: ben@algroup.co.uk |Apache-SSL author
> A.L. Digital Ltd,     |http://www.algroup.co.uk/Apache-SSL
> London, England.      |"Apache: TDG" http://www.ora.com/catalog/apache
> 


Re: cvs commit: apachen/src/ap ap.h

Posted by Ben Laurie <be...@algroup.co.uk>.
Rodent of Unusual Size wrote:
> 
> Ben Laurie wrote:
> >
> > coar@hyperreal.org wrote:
> > >
> > >   -INCLUDES_AUTODEPTH="$INCLUDES_AUTODEPTH $OSDIR main"
> > >   +INCLUDES_AUTODEPTH="$INCLUDES_AUTODEPTH $OSDIR main ap"
> >
> > The only way (that I'm aware of) to make this work in Win32 is to edit
> > _every_ makefile. Either find a way to do it without so much effort, or
> > make the path explicit where you include the file.
> 
> Humm.  Well, I think we need a Win32 Configure as part of the
> source package that will do this.  If I had an NT box handy I'd
> give this a try..  Noted.

Umm. In the meantime we can't compile Win32.

Cheers,

Ben.

-- 
Ben Laurie            |Phone: +44 (181) 735 0686|Apache Group member
Freelance Consultant  |Fax:   +44 (181) 735 0689|http://www.apache.org
and Technical Director|Email: ben@algroup.co.uk |Apache-SSL author
A.L. Digital Ltd,     |http://www.algroup.co.uk/Apache-SSL
London, England.      |"Apache: TDG" http://www.ora.com/catalog/apache

Re: cvs commit: apachen/src/ap ap.h

Posted by Rodent of Unusual Size <Ke...@Golux.Com>.
Ben Laurie wrote:
> 
> coar@hyperreal.org wrote:
> >
> >   -INCLUDES_AUTODEPTH="$INCLUDES_AUTODEPTH $OSDIR main"
> >   +INCLUDES_AUTODEPTH="$INCLUDES_AUTODEPTH $OSDIR main ap"
> 
> The only way (that I'm aware of) to make this work in Win32 is to edit
> _every_ makefile. Either find a way to do it without so much effort, or
> make the path explicit where you include the file.

Humm.  Well, I think we need a Win32 Configure as part of the
source package that will do this.  If I had an NT box handy I'd
give this a try..  Noted.

#ken	P-)}

Re: cvs commit: apachen/src/ap ap.h

Posted by Paul Sutton <pa...@c2.net>.
On Thu, 22 Jan 1998, Ben Laurie wrote:
> >   -INCLUDES_AUTODEPTH="$INCLUDES_AUTODEPTH $OSDIR main"
> >   +INCLUDES_AUTODEPTH="$INCLUDES_AUTODEPTH $OSDIR main ap"
> 
> The only way (that I'm aware of) to make this work in Win32 is to edit
> _every_ makefile. Either find a way to do it without so much effort, or
> make the path explicit where you include the file.

Oh, windows development is so lame. Can't we have a header directory (say,
src/h) where we copy the header files into, and just have all the
makefiles use that directory? 

Paul

Re: cvs commit: apachen/src/ap ap.h

Posted by Ben Laurie <be...@algroup.co.uk>.
coar@hyperreal.org wrote:
>   Revision  Changes    Path
>   1.177     +1 -1      apachen/src/Configure
> 
>   Index: Configure
>   ===================================================================
>   RCS file: /export/home/cvs/apachen/src/Configure,v
>   retrieving revision 1.176
>   retrieving revision 1.177
>   diff -u -r1.176 -r1.177
>   --- Configure 1998/01/13 23:11:04     1.176
>   +++ Configure 1998/01/21 17:12:34     1.177
>   @@ -991,7 +991,7 @@
>    echo "CFLAGS1=$CFLAGS">> Makefile.config
>    echo "INCLUDES1=$INCLUDES">> Makefile.config
> 
>   -INCLUDES_AUTODEPTH="$INCLUDES_AUTODEPTH $OSDIR main"
>   +INCLUDES_AUTODEPTH="$INCLUDES_AUTODEPTH $OSDIR main ap"

The only way (that I'm aware of) to make this work in Win32 is to edit
_every_ makefile. Either find a way to do it without so much effort, or
make the path explicit where you include the file.

Cheers,

Ben.

-- 
Ben Laurie            |Phone: +44 (181) 735 0686|Apache Group member
Freelance Consultant  |Fax:   +44 (181) 735 0689|http://www.apache.org
and Technical Director|Email: ben@algroup.co.uk |Apache-SSL author
A.L. Digital Ltd,     |http://www.algroup.co.uk/Apache-SSL
London, England.      |"Apache: TDG" http://www.ora.com/catalog/apache