apr_gethostname()

2001-03-16 Thread Doug MacEachern
i just noticed that this function takes an apr_pool_t* argument, but none
of the implementations (unix, win32 , os2) use it for anything.  any
reason not to remove this unused arg?



Re: apr_gethostname()

2001-03-16 Thread rbb
On Thu, 15 Mar 2001, Doug MacEachern wrote:

 i just noticed that this function takes an apr_pool_t* argument, but none
 of the implementations (unix, win32 , os2) use it for anything.  any
 reason not to remove this unused arg?


Yes.  All APR functions must have acess to a pool.  Imagine a platform
that requires we allocate memory for gethostname before we call the system
call.  If we don't pass the pool, we can't allocate the memory.  We are
trying to be future proof, which may be stupid, but that was part of the
original design.

Ryan

___
Ryan Bloom  [EMAIL PROTECTED]
406 29th St.
San Francisco, CA 94131
---



Re: Problem Build Latest Win32 CVS Release

2001-03-16 Thread Ian Holsman
It compiles OK.
I've got 2 other issues the build at the moment
 Creating library Debug/libhttpd.lib and object Debug/libhttpd.exp
mod_access.obj : error LNK2001: unresolved external symbol 
[EMAIL PROTECTED]
mod_access.obj : error LNK2001: unresolved external symbol 
[EMAIL PROTECTED]

and the include path of the xml project doesn't reference the 
./expat/lib directory in it's include path,
but the expat-lite directory which is now empty.

..Ian
From: [EMAIL PROTECTED] (Jeff Trawick)
Newsgroups: server.web.apache.apr
Subject: Re: Problem Build Latest Win32 CVS Release
Ian Holsman [EMAIL PROTECTED] writes:
 Hi.
 I'm trying to build the latest APR CVS release using the .dsw supplied
 in Apache.

 I've run into the problem where it couldn't find apr_inet_pton.
 I can't just include the file, as it uses EAFNOSUPPORT which isn't 
defined
 in Win32.

 I think this is a pretty recent change, due to the Win32 file trying
 include ../unix/sa_common.c

I guess I'm the problem... I didn't realize that we didn't build
inet_pton on Win32.
Can you try this?  Hopefully I'll get a chance to play with it later.
Thanks (and sorry!),
Jeff
Index: apr.dsp
===
RCS file: /home/cvspublic/apr/apr.dsp,v
retrieving revision 1.66
diff -u -r1.66 apr.dsp
--- apr.dsp2001/02/03 16:31:071.66
+++ apr.dsp2001/03/15 23:32:36
@@ -267,6 +267,10 @@
# End Source File
# Begin Source File
+SOURCE=.\network_io\unix\inet_pton.c
+# End Source File
+# Begin Source File
+
SOURCE=.\include\arch\win32\networkio.h
# End Source File
# Begin Source File
Index: network_io/unix/inet_pton.c
===
RCS file: /home/cvspublic/apr/network_io/unix/inet_pton.c,v
retrieving revision 1.4
diff -u -r1.4 inet_pton.c
--- network_io/unix/inet_pton.c2001/03/07 17:41:371.4
+++ network_io/unix/inet_pton.c2001/03/15 23:32:40
@@ -48,6 +48,10 @@
#define __P(x) x
#endif
+#if !defined(EAFNOSUPPORT)  defined(WSAEAFNOSUPPORT)
+#define EAFNOSUPPORT WSAEAFNOSUPPORT
+#endif
+
/*
 * WARNING: Don't even consider trying to compile this on a system where
 * sizeof(int)  4.  sizeof(int)  4 is fine; all the world's not a VAX.

--
Jeff Trawick | [EMAIL PROTECTED] | PGP public key at web site:
 http://www.geocities.com/SiliconValley/Park/9289/
   Born in Roswell... married an alien...


Re: apr_gethostname()

2001-03-16 Thread Doug MacEachern
On Thu, 15 Mar 2001 [EMAIL PROTECTED] wrote:
 
 Yes.  All APR functions must have acess to a pool.  Imagine a platform
 that requires we allocate memory for gethostname before we call the system
 call.  If we don't pass the pool, we can't allocate the memory.  We are
 trying to be future proof, which may be stupid, but that was part of the
 original design.

ok, this makes sense.  but i think you mean 'Most' not 'All' APR functions :)

an Apache::ParseSource scripted query reveals:

87 functions (out of 344) do not have access to a pool:

char * apr_strerror(apr_status_t statcode, char * buf, apr_size_t bufsize)

apr_size_t apr_pool_free_blocks_num_bytes()

void apr_pool_cleanup_for_exec()

apr_status_t apr_pool_cleanup_null(void * data)

apr_time_t apr_time_now()

apr_status_t apr_ansi_time_to_apr_time(apr_time_t * result, time_t input)

apr_status_t apr_explode_gmt(apr_exploded_time_t * result, apr_time_t input)

apr_status_t apr_explode_localtime(apr_exploded_time_t * result, apr_time_t 
input)

apr_status_t apr_implode_time(apr_time_t * result, apr_exploded_time_t * input)

void apr_sleep(apr_interval_time_t t)

apr_status_t apr_rfc822_date(char * date_str, apr_time_t t)

apr_status_t apr_ctime(char * date_str, apr_time_t t)

apr_status_t apr_strftime(char * s, apr_size_t * retsize, apr_size_t max, const 
char * format, apr_exploded_time_t * tm)

apr_status_t apr_file_perms_set(const char * fname, apr_fileperms_t perms)

apr_status_t apr_fnmatch(const char * pattern, const char * strings, int flags)

int apr_is_fnmatch(const char * pattern)

apr_status_t apr_generate_random_bytes(unsigned char * buf, int length)

apr_status_t apr_initialize()

void apr_terminate()

const char * apr_filename_of_pathname(const char * pathname)

int apr_vformatter(int (*flush_func)(apr_vformatter_buff_t *b) arg0, 
apr_vformatter_buff_t * c, const char * fmt, va_list ap)

apr_status_t apr_password_validate(const char * passwd, const char * hash)

apr_status_t apr_password_get(const char * prompt, char * pwbuf, size_t * 
bufsize)

apr_status_t apr_md5_encode(const char * password, const char * salt, char * 
result, size_t nbytes)

apr_status_t apr_proc_detach()

void apr_proc_other_child_unregister(void * data)

void apr_proc_other_child_check()

void apr_proc_probe_writable_fds()

apr_status_t apr_setup_signal_thread()

apr_status_t apr_os_exp_time_get(apr_os_exp_time_t ** ostime, 
apr_exploded_time_t * aprtime)

apr_status_t apr_os_imp_time_get(apr_os_imp_time_t ** ostime, apr_time_t * 
aprtime)

apr_status_t apr_shm_destroy(apr_shmem_t * m)

void * apr_shm_malloc(apr_shmem_t * c, apr_size_t reqsize)

void * apr_shm_calloc(apr_shmem_t * shared, apr_size_t size)

apr_status_t apr_shm_free(apr_shmem_t * shared, void * entity)

apr_status_t apr_shm_name_get(apr_shmem_t * c, apr_shm_name_t ** name)

apr_status_t apr_shm_name_set(apr_shmem_t * c, apr_shm_name_t * name)

apr_status_t apr_shm_open(apr_shmem_t * c)

apr_status_t apr_shm_avail(apr_shmem_t * c, apr_size_t * avail)

apr_sigfunc_t * apr_signal(int signo, apr_sigfunc_t * func)

const char * apr_signal_get_description(int signum)

int apr_strnatcmp(char const * a, char const * b)

int apr_strnatcasecmp(char const * a, char const * b)

char * apr_cpystrn(char * dst, const char * src, size_t dst_size)

char * apr_collapse_spaces(char * dest, const char * src)

int apr_snprintf(char * buf, size_t len, const char * format, ... arg3)

int apr_vsnprintf(char * buf, size_t len, const char * format, va_list ap)

void apr_uuid_get(apr_uuid_t * uuid)

void apr_uuid_format(char * buffer, const apr_uuid_t * uuid)

apr_status_t apr_uuid_parse(apr_uuid_t * uuid, const char * uuid_str)

int apr_base64_encode_len(int len)

int apr_base64_encode(char * coded_dst, const char * plain_src, int 
len_plain_src)

int apr_base64_encode_binary(char * coded_dst, const unsigned char * plain_src, 
int len_plain_src)

int apr_base64_decode_len(const char * coded_src)

int apr_base64_decode(char * plain_dst, const char * coded_src)

int apr_base64_decode_binary(unsigned char * plain_dst, const char * coded_src)

apr_status_t apr_bucket_setaside_notimpl(apr_bucket * data)

apr_status_t apr_bucket_split_notimpl(apr_bucket * data, apr_off_t point)

apr_status_t apr_bucket_copy_notimpl(apr_bucket * e, apr_bucket ** c)

void apr_bucket_destroy_notimpl(void * data)

apr_status_t apr_bucket_simple_split(apr_bucket * b, apr_off_t point)

apr_status_t apr_bucket_simple_copy(apr_bucket * a, apr_bucket ** b)

apr_bucket * apr_bucket_shared_make(apr_bucket * b, void * data, apr_off_t 
start, apr_off_t length)

int apr_bucket_shared_destroy(void * data)

apr_status_t apr_bucket_shared_split(apr_bucket * b, apr_off_t point)

apr_status_t apr_bucket_shared_copy(apr_bucket * a, apr_bucket ** b)

apr_bucket * apr_bucket_eos_create()

apr_bucket * apr_bucket_eos_make(apr_bucket * b)

apr_bucket * apr_bucket_flush_create()

apr_bucket * apr_bucket_flush_make(apr_bucket * b)

apr_bucket * 

Re: Problem Build Latest Win32 CVS Release

2001-03-16 Thread Jeff Trawick
Ian Holsman [EMAIL PROTECTED] writes:

 It compiles OK.
 
 I've got 2 other issues the build at the moment
 
   Creating library Debug/libhttpd.lib and object Debug/libhttpd.exp
 mod_access.obj : error LNK2001: unresolved external symbol
 [EMAIL PROTECTED]
 mod_access.obj : error LNK2001: unresolved external symbol
 [EMAIL PROTECTED]

oops... the darn .def file...  I'm getting my windows machine up
to date now and will work on it shortly...

 and the include path of the xml project doesn't reference the
 ./expat/lib directory in it's include path,
 but the expat-lite directory which is now empty.

I'll see what I can do...  I'm pretty clumsy with the project files.

Thanks...
-- 
Jeff Trawick | [EMAIL PROTECTED] | PGP public key at web site:
   http://www.geocities.com/SiliconValley/Park/9289/
 Born in Roswell... married an alien...


Re: Problem Build Latest Win32 CVS Release

2001-03-16 Thread William A. Rowe, Jr.
Many comments on several posts

Creating library Debug/libhttpd.lib and object Debug/libhttpd.exp
  mod_access.obj : error LNK2001: unresolved external symbol
  [EMAIL PROTECTED]
  mod_access.obj : error LNK2001: unresolved external symbol
  [EMAIL PROTECTED]
 
 oops... the darn .def file...  I'm getting my windows machine up
 to date now and will work on it shortly...


No def files... please properly APR_DECLARE(rettype) apr_fn(args)
always and this doesn't become a problem again, ever.


  and the include path of the xml project doesn't reference the
  ./expat/lib directory in it's include path,
  but the expat-lite directory which is now empty.
 
 I'll see what I can do...  I'm pretty clumsy with the project files.


Bill Stoddard already committed that fix, but your apr.dsp fix is fine,
however...


 Index: apr.dsp
 ===
 RCS file: /home/cvspublic/apr/apr.dsp,v
 retrieving revision 1.66
 diff -u -r1.66 apr.dsp
 --- apr.dsp 2001/02/03 16:31:07 1.66
 +++ apr.dsp 2001/03/15 23:32:36
 @@ -267,6 +267,10 @@
  # End Source File
  # Begin Source File
  
 +SOURCE=.\network_io\unix\inet_pton.c
 +# End Source File
 +# Begin Source File
 +


PLEASE please (pretty please) remember to keep apr/libapr .dsp files in sync.
While it's a pain, its easier than having to keep those .def files up to date 
;-)



 Index: network_io/unix/inet_pton.c
 ===
 RCS file: /home/cvspublic/apr/network_io/unix/inet_pton.c,v
 retrieving revision 1.4
 diff -u -r1.4 inet_pton.c
 --- network_io/unix/inet_pton.c 2001/03/07 17:41:37 1.4
 +++ network_io/unix/inet_pton.c 2001/03/15 23:32:40
 @@ -48,6 +48,10 @@
  #define __P(x) x
  #endif
  
 +#if !defined(EAFNOSUPPORT)  defined(WSAEAFNOSUPPORT)
 +#define EAFNOSUPPORT WSAEAFNOSUPPORT
 +#endif
 +

This needs to be APR_EAFNOSUPPORT and a status test, _please_ fix this
in the canonical errors header!  Then the APR_STATUS_IS_EAFNOSUPPORT()
on Win32 compares WSAEAFNOSUPPORT, and on OS2 it will do what OS2 does.

Other than that, looks like you are all over this (as in... on top of it :-)



Re: Problem Build Latest Win32 CVS Release

2001-03-16 Thread Jeff Trawick
William A. Rowe, Jr. [EMAIL PROTECTED] writes:

 Many comments on several posts
 
 Creating library Debug/libhttpd.lib and object Debug/libhttpd.exp
   mod_access.obj : error LNK2001: unresolved external symbol
   [EMAIL PROTECTED]
   mod_access.obj : error LNK2001: unresolved external symbol
   [EMAIL PROTECTED]
  
  oops... the darn .def file...  I'm getting my windows machine up
  to date now and will work on it shortly...
 
 
 No def files... please properly APR_DECLARE(rettype) apr_fn(args)
 always and this doesn't become a problem again, ever.

hmmm... it was done properly to start with... I don't know why Ian was
getting this error

  Index: apr.dsp
  ===
  RCS file: /home/cvspublic/apr/apr.dsp,v
  retrieving revision 1.66
  diff -u -r1.66 apr.dsp
  --- apr.dsp 2001/02/03 16:31:07 1.66
  +++ apr.dsp 2001/03/15 23:32:36
  @@ -267,6 +267,10 @@
   # End Source File
   # Begin Source File
   
  +SOURCE=.\network_io\unix\inet_pton.c
  +# End Source File
  +# Begin Source File
  +
 
 
 PLEASE please (pretty please) remember to keep apr/libapr .dsp files in sync.
 While it's a pain, its easier than having to keep those .def files
 up to date ;-)

found that out too :)  done...

  Index: network_io/unix/inet_pton.c
  ===
  RCS file: /home/cvspublic/apr/network_io/unix/inet_pton.c,v
  retrieving revision 1.4
  diff -u -r1.4 inet_pton.c
  --- network_io/unix/inet_pton.c 2001/03/07 17:41:37 1.4
  +++ network_io/unix/inet_pton.c 2001/03/15 23:32:40
  @@ -48,6 +48,10 @@
   #define __P(x) x
   #endif
   
  +#if !defined(EAFNOSUPPORT)  defined(WSAEAFNOSUPPORT)
  +#define EAFNOSUPPORT WSAEAFNOSUPPORT
  +#endif
  +
 
 This needs to be APR_EAFNOSUPPORT and a status test, _please_ fix this
 in the canonical errors header!  Then the APR_STATUS_IS_EAFNOSUPPORT()
 on Win32 compares WSAEAFNOSUPPORT, and on OS2 it will do what OS2
 does.

not tonight... dead code anyway...  maybe useful if EAFNOSUPPORT could
be exposed to callers of APR

 Other than that, looks like you are all over this (as in... on top
 of it :-)

not really...

-- 
Jeff Trawick | [EMAIL PROTECTED] | PGP public key at web site:
   http://www.geocities.com/SiliconValley/Park/9289/
 Born in Roswell... married an alien...




Re: Problem Build Latest Win32 CVS Release

2001-03-16 Thread William A. Rowe, Jr.
From: Jeff Trawick [EMAIL PROTECTED]
Sent: Thursday, March 15, 2001 9:42 PM

  No def files... please properly APR_DECLARE(rettype) apr_fn(args)
  always and this doesn't become a problem again, ever.
 
 hmmm... it was done properly to start with... I don't know why Ian was
 getting this error

Neither do I, except if he didn't clean before his last make.  I don't get
this error either.

   +#if !defined(EAFNOSUPPORT)  defined(WSAEAFNOSUPPORT)
   +#define EAFNOSUPPORT WSAEAFNOSUPPORT
   +#endif
   +
  
  This needs to be APR_EAFNOSUPPORT and a status test, _please_ fix this
  in the canonical errors header!  Then the APR_STATUS_IS_EAFNOSUPPORT()
  on Win32 compares WSAEAFNOSUPPORT, and on OS2 it will do what OS2
  does.
 
 not tonight... dead code anyway...  maybe useful if EAFNOSUPPORT could
 be exposed to callers of APR

Doesn't need to be tonight, I just worry over these sorts of things :-)
With my last commit after the dbmmanage.in change, Win32 builds fine again.

Bill




Re: httpd-2.0/apr/apr-util Code Freeze

2001-03-16 Thread Luke Kenneth Casson Leighton
greg et al,

just to let you know.

i just had to set up, here, a second partial tag, this time quite
a significant rewrite of my database modules and the way they're being
used in the project i'm doing.

i tagged just the db.py, monitord.py and sql2000xmldb.py files.

i then found whoops, a bug in the monitord.py file that needed correcting
in both cvs main _and_ the tagged version.

so i corrected it in both - making sure that it _was_ exactly the same
correction in both.

the file monitord.py _does_ also contain other modifications.

after performing a merge into cvs main with cvs update -j dualdbdesign,
guess what?

no conflicts.

the only conflicts i get are in db.py where i forgot that i had renamed a
function in one file and added extra arguments to the original _not_
renamed function.

... which is exactly the sort of thing you really _do_ need to catch as a
conflict!

and during this time, guess what?

cvs main remained useable at all times.  if i had been asked to perform a
demonstration or to perform a release at any time, i would have been
confident enough to say no problem, immediately.

hope this helps.

luke

 - Luke Kenneth Casson Leighton [EMAIL PROTECTED] -

i want a world of dreams, run by near-sighted visionaries
good.  that's them sorted out.  now, on _this_ world...



Re: builconf APR and httpd2.0

2001-03-16 Thread jean-frederic clere
Means today...

I have retested it. It was not 100% OK, the shlibtool is not created, I
have probably missed a cp.

Find enclosed new patch :=(

Cheers

Jean-frederic

[EMAIL PROTECTED] wrote:
 
 I'll try to get this applied and committed today.  If I don't get to it
 until tomorrow, don't worry, it's on my short list.
 
 Ryan
 
 On Thu, 15 Mar 2001, jean-frederic clere wrote:
 
  Hi Ryan,
 
  I have fixed it - It works on my Linux Box -
 
  Find enclosed the patch for httpd-2.0
 
  Cheers
 
  Jean-frederic
 
  [EMAIL PROTECTED] wrote:
  
   This is most definately a bug.  APR should have a copy of the libtool
   files, and ANY APR application should just use those files.  There is no
   reason for httpd-2.0 to create links anyplace, it should just use APR's
   version.
  
   Ryan
  
   On Wed, 14 Mar 2001, jean-frederic clere wrote:
  
Hi,
   
I have noted that buildconf of httpd2.0 creates links for the libtool
needed elements and the APR one copies them in the build subdirectory:
+++
$ ls -lt
srclib/apr/build/ltconfig
-rwxr-xr-x   1 VTX3 Spain  97913 Mar 14 16:26
srclib/apr/build/ltconfig
$ ls -l
ltconfig
lrwxrwxrwx   1 VTX3 Spain 33 Mar 14 16:33 ltconfig -
/usr/local/share/libtool/ltconfig
$
+++
   
Is this a bug or a Feature?
   
Cheers
   
Jean-frederic
   
   
  
   ___
   Ryan Bloom  [EMAIL PROTECTED]
   406 29th St.
   San Francisco, CA 94131
   ---
 
 ___
 Ryan Bloom  [EMAIL PROTECTED]
 406 29th St.
 San Francisco, CA 94131
 ---Index: configure.in
===
RCS file: /home/cvs/apache/httpd-2.0/configure.in,v
retrieving revision 1.130
diff -u -r1.130 configure.in
--- configure.in2001/03/11 23:40:47 1.130
+++ configure.in2001/03/15 16:21:03
@@ -4,7 +4,7 @@
 AC_INIT(acinclude.m4)
 
 AC_CONFIG_HEADER(include/ap_config_auto.h)
-AC_CONFIG_AUX_DIR(.)
+AC_CONFIG_AUX_DIR(srclib/apr/build)
  
 dnl ## This is the central place where Apache's version should be kept.
 dnl AM_INIT_AUTOMAKE(apache, 2.0-dev)
@@ -20,6 +20,7 @@
 dnl Absolute source/build directory
 abs_srcdir=`(cd $srcdir  pwd)`
 abs_builddir=`pwd`
+aprbuild=$abs_srcdir/srclib/apr/build
 
 MKDIR=$abs_srcdir/srclib/apr/build/mkdir.sh
 
@@ -155,7 +156,7 @@
 APACHE_LIBTOOL_SILENT
 
 if test $apache_need_shared = yes; then
-  $SHELL $srcdir/ltconfig --output=shlibtool --disable-static --srcdir=$srcdir 
--cache-file=./config.cache $srcdir/ltmain.sh
+  $SHELL $aprbuild/ltconfig --output=shlibtool --disable-static 
--srcdir=$aprbuild --cache-file=./config.cache $aprbuild/ltmain.sh
   case $PLATFORM in
 *os390)
   CFLAGS=$CFLAGS -Wc,DLL,EXPORTALL
Index: build/build2.mk
===
RCS file: /home/cvs/apache/httpd-2.0/build/build2.mk,v
retrieving revision 1.30
diff -u -r1.30 build2.mk
--- build/build2.mk 2001/02/27 01:39:25 1.30
+++ build/build2.mk 2001/03/15 16:21:03
@@ -58,15 +58,13 @@
 
 TOUCH_FILES = mkinstalldirs install-sh missing
 
-LT_TARGETS = ltconfig ltmain.sh config.guess config.sub
-
 config_h_in = include/ap_config_auto.h.in
 apr_configure = srclib/apr/configure
 mm_configure = srclib/apr/shmem/unix/mm/configure
 pcre_configure = srclib/pcre/configure
 aprutil_configure = srclib/apr-util/configure
 
-APACHE_TARGETS = $(TOUCH_FILES) $(LT_TARGETS) configure $(config_h_in)
+APACHE_TARGETS = $(TOUCH_FILES) configure $(config_h_in)
 
 APR_TARGETS = $(apr_configure) $(mm_configure) $(aprutil_configure)
 
@@ -88,9 +86,6 @@
@echo dnl THIS FILE IS AUTOMATICALLY GENERATED BY buildconf $@
@echo dnl edits here will be lost $@
@cat acinclude.m4 $(libtool_m4)  $@
-
-$(LT_TARGETS):
-   libtoolize $(AMFLAGS) --force
 
 $(config_h_in): configure
 # explicitly remove target since autoheader does not seem to work 
Index: build/rules.mk
===
RCS file: /home/cvs/apache/httpd-2.0/build/rules.mk,v
retrieving revision 1.43
diff -u -r1.43 rules.mk
--- build/rules.mk  2001/02/26 04:38:18 1.43
+++ build/rules.mk  2001/03/15 16:21:03
@@ -188,7 +188,7 @@
rm -rf .libs
 
 distclean: distclean-recursive clean-x
-   rm -f config.cache config.log config.status config_vars.mk libtool \
+   rm -f config.cache config.log config.status config_vars.mk \
stamp-h Makefile shlibtool .deps $(DISTCLEAN_TARGETS)
 
 include $(builddir)/.deps


Re: Problem Build Latest Win32 CVS Release

2001-03-16 Thread Ian Holsman
Ok.
I deleted the entire directory, and re-checked out everything.
in project aprutil.
apr_xml.c
c:\src\apache\httpd-2.0\srclib\apr-util\xml\apr_xml.c(69) : fatal error 
C1083: Cannot open include file: 'expat.h': No such file or directory

FIX: change ../expat-lite to xml/expat/lib in the include directory
I've added the diff file for this.
All the other problems must have been due to my not cleaning .
Index: aprutil.dsp
===
RCS file: /home/cvspublic/apr-util/aprutil.dsp,v
retrieving revision 1.21
diff -r1.21 aprutil.dsp
28a29
 RSC=rc.exe
42c43,44
 RSC=rc.exe
---
 # ADD BASE CPP /nologo /MD /W3 /O2 /D WIN32 /D NDEBUG /D _WINDOWS /FD /c
 # ADD CPP /nologo /MD /W3 /O2 /I ./include /I ../apr/include /I 
 ./include/private /I ./dbm/sdbm /I ./xml/expat/lib /D NDEBUG /D 
 WIN32 /D _WINDOWS /D APR_DECLARE_STATIC /D APU_DECLARE_STATIC /D 
 APU_USE_SDBM /FdLibR\aprutil /FD /c
45,46d46
 # ADD BASE CPP /nologo /MD /W3 /O2 /D WIN32 /D NDEBUG /D _WINDOWS /FD /c
 # ADD CPP /nologo /MD /W3 /O2 /I ./include /I ../apr/include /I 
./include/private /I ./dbm/sdbm /I ../expat-lite /D NDEBUG /D WIN32 
/D _WINDOWS /D APR_DECLARE_STATIC /D APU_DECLARE_STATIC /D APU_USE_SDBM 
/FdLibR\aprutil /FD /c
67c67,68
 RSC=rc.exe
---
 # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D WIN32 /D _DEBUG /D 
 _WINDOWS /FD /c
 # ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ./include /I ../apr/include /I 
 ./include/private /I ./dbm/sdbm /I ./xml/expat/lib /D _DEBUG /D 
 WIN32 /D _WINDOWS /D APR_DECLARE_STATIC /D APU_DECLARE_STATIC /D 
 APU_USE_SDBM /FdLibD\aprutil /FD /c
70,71d70
 # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D WIN32 /D _DEBUG /D 
_WINDOWS /FD /c
 # ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ./include /I ../apr/include /I 
./include/private /I ./dbm/sdbm /I ../expat-lite /D _DEBUG /D WIN32 
/D _WINDOWS /D APR_DECLARE_STATIC /D APU_DECLARE_STATIC /D APU_USE_SDBM 
/FdLibD\aprutil /FD /c
257,266c256
 !IF  $(CFG) == libaprutil - Win32 Release
 
 # Begin Custom Build
 InputPath=.\include\private\apu_config.hw
 
 .\include\private\apu_config.h : $(SOURCE) $(INTDIR) $(OUTDIR)
   copy .\include\private\apu_config.hw .\include\private\apu_config.h  
nul 
   echo Created apu_config.h from apu_config.hw 
   
 # End Custom Build
---
 !IF  $(CFG) == aprutil - Win32 Release
268c258
 !ELSEIF  $(CFG) == libaprutil - Win32 Debug
---
 !ELSEIF  $(CFG) == aprutil - Win32 Debug
292,293c282
   copy .\include\private\apu_select_dbm.hw 
.\include\private\apu_select_dbm.h \
  nul 
---
   copy .\include\private\apu_select_dbm.hw 
 .\include\private\apu_select_dbm.h   nul 
304,305c293
   copy .\include\private\apu_select_dbm.hw 
.\include\private\apu_select_dbm.h \
  nul 
---
   copy .\include\private\apu_select_dbm.hw 
 .\include\private\apu_select_dbm.h   nul