cvs commit: apache-2.0/src/lib/apr/include apr_win.h

2000-01-24 Thread stoddard
stoddard00/01/23 19:03:50

  Modified:src/lib/apr/include apr_win.h
  Log:
  Fix APR_HAVE_IN_ADDR
  
  Revision  ChangesPath
  1.13  +1 -1  apache-2.0/src/lib/apr/include/apr_win.h
  
  Index: apr_win.h
  ===
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_win.h,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- apr_win.h 2000/01/23 16:37:36 1.12
  +++ apr_win.h 2000/01/24 03:03:49 1.13
  @@ -89,6 +89,7 @@
   #define APR_HAVE_STDIO_H1
   #define APR_HAVE_SYS_TYPES_H1
   #define APR_HAVE_SYS_UIO_H  0
  +#define APR_HAVE_IN_ADDR1
   
   #define APR_USE_FLOCK_SERIALIZE   0 
   #define APR_USE_SYSVSEM_SERIALIZE 0
  @@ -104,7 +105,6 @@
   #define APR_HAS_THREADS  1
   #define APR_HAS_SENDFILE 0
   #define APR_HAS_MMAP 0
  -#define APR_HAVE_IN_ADDR
   
   /* Typedefs that APR needs. */
   
  
  
  


cvs commit: apache-1.3 STATUS

2000-01-24 Thread jim
jim 00/01/24 05:32:52

  Modified:.STATUS
  Log:
  Open up CVS. Now keep track of which
  binaries have been built and uploaded
  
  Revision  ChangesPath
  1.796 +7 -6  apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /export/home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.795
  retrieving revision 1.796
  diff -u -r1.795 -r1.796
  --- STATUS2000/01/18 17:06:49 1.795
  +++ STATUS2000/01/24 13:32:51 1.796
  @@ -1,13 +1,14 @@
 1.3 STATUS:
  -  Last modified at [$Date: 2000/01/18 17:06:49 $]
  +  Last modified at [$Date: 2000/01/24 13:32:51 $]
   
   Release:
   
  -1.3.11-dev: Current. We will release on 1/21/2000.
  -   Timeline:
  - 1/19/2000: tag and roll tarball
  - 1/21/2000: Release and announce
  - 1/23/2000: Re-open CVS
  +1.3.12-dev: In development
  +1.3.11: Tagged and rolled Jan. 19, 2000. Released and
  +announced on the 21st.
  + PREBUILT BINARIES:
  +  
  +
   1.3.10: Not released. Pulled at last minute due to
   a build bug in the MPE port.
   1.3.9: Tagged and rolled on Aug. 16. Released and announced on 19th.
  
  
  


cvs commit: apache-1.3 STATUS

2000-01-24 Thread jim
jim 00/01/24 05:46:35

  Modified:.STATUS
  Log:
  The FreeBSD 2.2.8 binary is available
  
  Revision  ChangesPath
  1.797 +2 -2  apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /export/home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.796
  retrieving revision 1.797
  diff -u -r1.796 -r1.797
  --- STATUS2000/01/24 13:32:51 1.796
  +++ STATUS2000/01/24 13:46:34 1.797
  @@ -1,5 +1,5 @@
 1.3 STATUS:
  -  Last modified at [$Date: 2000/01/24 13:32:51 $]
  +  Last modified at [$Date: 2000/01/24 13:46:34 $]
   
   Release:
   
  @@ -7,7 +7,7 @@
   1.3.11: Tagged and rolled Jan. 19, 2000. Released and
   announced on the 21st.
PREBUILT BINARIES:
  -  
  +  FreeBSD-2.2.8: Jim
   
   1.3.10: Not released. Pulled at last minute due to
   a build bug in the MPE port.
  
  
  


cvs commit: apache-2.0/src/lib/apr/locks/unix locks.h

2000-01-24 Thread rbb
rbb 00/01/24 05:59:03

  Modified:src/lib/apr acconfig.h configure.in
   src/lib/apr/include apr.h.in apr_portable.h
   src/lib/apr/locks/unix locks.h
  Log:
  Namespace protect the HAVE_SEMUN variable that was added.  This has not
  been tested fully, because I don't have access to a platform that uses
  semaphores, but the logic is sound.
  
  Revision  ChangesPath
  1.21  +0 -1  apache-2.0/src/lib/apr/acconfig.h
  
  Index: acconfig.h
  ===
  RCS file: /home/cvs/apache-2.0/src/lib/apr/acconfig.h,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- acconfig.h2000/01/11 12:58:46 1.20
  +++ acconfig.h2000/01/24 13:58:59 1.21
  @@ -27,7 +27,6 @@
   @TOP@
   
   /* Various #defines we need to know about */
  -#undef HAVE_STRUCT_UNION_SEMUN
   #undef HAVE_LOCK_EX
   #undef HAVE_F_SETLK
   #undef HAVE_PTHREAD_PROCESS_SHARED
  
  
  
  1.47  +6 -3  apache-2.0/src/lib/apr/configure.in
  
  Index: configure.in
  ===
  RCS file: /home/cvs/apache-2.0/src/lib/apr/configure.in,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- configure.in  2000/01/23 01:13:44 1.46
  +++ configure.in  2000/01/24 13:58:59 1.47
  @@ -221,6 +221,7 @@
   AC_CHECK_HEADERS(osreldate.h)
   AC_CHECK_HEADERS(process.h)
   AC_CHECK_HEADERS(pwd.h)
  +AC_CHECK_HEADERS(sys/sem.h)
   AC_CHECK_HEADERS(setjmp.h)
   AC_CHECK_HEADERS(signal.h)
   AC_CHECK_HEADERS(stdarg.h, stdargh=1, stdargh=0)
  @@ -285,10 +286,12 @@
   ],[
   union semun arg;
   semctl(0, 0, 0, arg);
  -], [AC_DEFINE(HAVE_STRUCT_UNION_SEMUN) union_semun=yes]
  -msg=yes,dnl
  -msg=no)
  +], [have_union_semun=1 union_semun=yes ]
  +msg=yes, [
  +have_union_semun=0
  +msg=no ] )
   AC_MSG_RESULT([$msg])
  +AC_SUBST(have_union_semun)
   
   AC_MSG_CHECKING(looking for in_addr in netinet/in.h)
   AC_TRY_COMPILE([
  
  
  
  1.10  +1 -0  apache-2.0/src/lib/apr/include/apr.h.in
  
  Index: apr.h.in
  ===
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr.h.in,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- apr.h.in  2000/01/19 01:14:55 1.9
  +++ apr.h.in  2000/01/24 13:59:01 1.10
  @@ -43,6 +43,7 @@
   #define APR_HAVE_IN_ADDR@have_in_addr@
   #define APR_HAVE_INET_ADDR  @inet_addr@
   #define APR_HAVE_INET_NETWORK   @inet_network@
  +#define APR_HAVE_UNION_SEMUN@have_union_semun@
   
   #if APR_HAVE_SYS_TYPES_H
   #include sys/types.h
  
  
  
  1.20  +1 -1  apache-2.0/src/lib/apr/include/apr_portable.h
  
  Index: apr_portable.h
  ===
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_portable.h,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- apr_portable.h2000/01/23 01:13:45 1.19
  +++ apr_portable.h2000/01/24 13:59:01 1.20
  @@ -81,7 +81,7 @@
   #if APR_HAVE_PTHREAD_H
   #include pthread.h
   #endif
  -#ifdef HAVE_STRUCT_UNION_SEMUN
  +#if APR_HAVE_UNION_SEMUN
   #include sys/sem.h
   #endif
   
  
  
  
  1.10  +1 -4  apache-2.0/src/lib/apr/locks/unix/locks.h
  
  Index: locks.h
  ===
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/locks.h,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- locks.h   2000/01/23 01:13:47 1.9
  +++ locks.h   2000/01/24 13:59:02 1.10
  @@ -88,9 +88,6 @@
   #if HAVE_FCNTL_H
   #include fcntl.h
   #endif
  -#ifdef HAVE_STRUCT_UNION_SEMUN
  -#include sys/sem.h
  -#endif
   
   #if APR_HAS_THREADS
   #if HAVE_PTHREAD_H
  @@ -99,7 +96,7 @@
   #endif
   /* End System Headers */
   
  -#ifndef HAVE_STRUCT_UNION_SEMUN
  +#if !APR_HAVE_UNION_SEMUN  APR_USE_SYSVSEM_SERIALIZE
   /* it makes no sense, but this isn't defined on solaris */
   union semun {
   long val;
  
  
  


Re: cvs commit: apache-2.0/src/lib/apr/locks/unix locks.h

2000-01-24 Thread Ben Laurie
[EMAIL PROTECTED] wrote:
   1.10  +1 -4  apache-2.0/src/lib/apr/locks/unix/locks.h
 
   Index: locks.h
   ===
   RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/locks.h,v
   retrieving revision 1.9
   retrieving revision 1.10
   diff -u -r1.9 -r1.10
   --- locks.h   2000/01/23 01:13:47 1.9
   +++ locks.h   2000/01/24 13:59:02 1.10
   @@ -88,9 +88,6 @@
#if HAVE_FCNTL_H
#include fcntl.h
#endif
   -#ifdef HAVE_STRUCT_UNION_SEMUN
   -#include sys/sem.h
   -#endif
 
#if APR_HAS_THREADS
#if HAVE_PTHREAD_H
   @@ -99,7 +96,7 @@
#endif
/* End System Headers */
 
   -#ifndef HAVE_STRUCT_UNION_SEMUN
   +#if !APR_HAVE_UNION_SEMUN  APR_USE_SYSVSEM_SERIALIZE
/* it makes no sense, but this isn't defined on solaris */
union semun {
long val;

Que? If you don't include sys/sem.h, then this doesn't compile - why did
you remove it?

BTW, why are these structures included in the locking structure at all?
They're essentially constant static structures, but they currently exist
in each lock.

Cheers,

Ben.

--
SECURE HOSTING AT THE BUNKER! http://www.thebunker.net/hosting.htm

http://www.apache-ssl.org/ben.html

Y19100 no-prize winner!
http://www.ntk.net/index.cgi?back=2000/now0121.txt


Re: cvs commit: apache-2.0/src/lib/apr/locks/unix locks.h

2000-01-24 Thread rbb

-#ifdef HAVE_STRUCT_UNION_SEMUN
-#include sys/sem.h
-#endif
  
 #if APR_HAS_THREADS
 #if HAVE_PTHREAD_H
@@ -99,7 +96,7 @@
 #endif
 /* End System Headers */
  
-#ifndef HAVE_STRUCT_UNION_SEMUN
+#if !APR_HAVE_UNION_SEMUN  APR_USE_SYSVSEM_SERIALIZE
 /* it makes no sense, but this isn't defined on solaris */
 union semun {
 long val;
 
 Que? If you don't include sys/sem.h, then this doesn't compile - why did
 you remove it?

If you look about four lines above this,. we include sys/sem.h if it is on
the system.  The problem was we weren't checking for it.  I put the check
into configure.in, so we should be including it.  I just didn't see a need
for sys/sem.h to be included twice.  :-)

 
 BTW, why are these structures included in the locking structure at all?
 They're essentially constant static structures, but they currently exist
 in each lock.
 

I have no good answer for this.  I'll look into it though.

Ryan


Come to the first official Apache Software Foundation
Conference!!!   http://ApacheCon.Com/

___
Ryan Bloom  [EMAIL PROTECTED]
2121 Stonehenge Dr. Apt #3
Raleigh, NC 27615   Ryan Bloom -- thinker, adventurer, artist,
 writer, but mostly, friend.
---



Re: cvs commit: apache-2.0/src/lib/apr/locks/unix locks.h

2000-01-24 Thread Ben Laurie
[EMAIL PROTECTED] wrote:
 
 -#ifdef HAVE_STRUCT_UNION_SEMUN
 -#include sys/sem.h
 -#endif
  
  #if APR_HAS_THREADS
  #if HAVE_PTHREAD_H
 @@ -99,7 +96,7 @@
  #endif
  /* End System Headers */
  
 -#ifndef HAVE_STRUCT_UNION_SEMUN
 +#if !APR_HAVE_UNION_SEMUN  APR_USE_SYSVSEM_SERIALIZE
  /* it makes no sense, but this isn't defined on solaris */
  union semun {
  long val;
 
  Que? If you don't include sys/sem.h, then this doesn't compile - why did
  you remove it?
 
 If you look about four lines above this,. we include sys/sem.h if it is on
 the system.  The problem was we weren't checking for it.  I put the check
 into configure.in, so we should be including it.  I just didn't see a need
 for sys/sem.h to be included twice.  :-)

Aha! :-)

In which case, it'd make sense to use HAVE_SYS_SEM_H for the other one,
too.

  BTW, why are these structures included in the locking structure at all?
  They're essentially constant static structures, but they currently exist
  in each lock.
 
 
 I have no good answer for this.  I'll look into it though.

:-)

Cheers,

Ben.

--
SECURE HOSTING AT THE BUNKER! http://www.thebunker.net/hosting.htm

http://www.apache-ssl.org/ben.html

Y19100 no-prize winner!
http://www.ntk.net/index.cgi?back=2000/now0121.txt


cvs commit: apache-2.0/src/os/win32 ApacheOS.dsp ApacheOS.mak

2000-01-24 Thread stoddard
stoddard00/01/24 12:50:47

  Modified:src/os/win32 ApacheOS.dsp ApacheOS.mak
  Log:
  Add APR include file search path to the release build
  
  Revision  ChangesPath
  1.3   +1 -1  apache-2.0/src/os/win32/ApacheOS.dsp
  
  Index: ApacheOS.dsp
  ===
  RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheOS.dsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ApacheOS.dsp  2000/01/20 20:58:43 1.2
  +++ ApacheOS.dsp  2000/01/24 20:50:43 1.3
  @@ -39,7 +39,7 @@
   # PROP Intermediate_Dir ApacheOSR
   # PROP Target_Dir 
   # ADD BASE CPP /nologo /W3 /GX /O2 /D WIN32 /D NDEBUG /D _WINDOWS /YX 
/FD /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /D WIN32 /D NDEBUG /D _WINDOWS /YX 
/FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I ../../lib/apr/include /D WIN32 /D 
NDEBUG /D _WINDOWS /YX /FD /c
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
  
  
  
  1.3   +27 -52apache-2.0/src/os/win32/ApacheOS.mak
  
  Index: ApacheOS.mak
  ===
  RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheOS.mak,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ApacheOS.mak  2000/01/20 20:58:46 1.2
  +++ ApacheOS.mak  2000/01/24 20:50:44 1.3
  @@ -26,6 +26,8 @@
   NULL=nul
   !ENDIF 
   
  +CPP=cl.exe
  +
   !IF  $(CFG) == ApacheOS - Win32 Release
   
   OUTDIR=.\ApacheOSR
  @@ -52,42 +54,11 @@
   $(OUTDIR) :
   if not exist $(OUTDIR)/$(NULL) mkdir $(OUTDIR)
   
  -CPP=cl.exe
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /D WIN32 /D NDEBUG /D _WINDOWS\
  - /Fp$(INTDIR)\ApacheOS.pch /YX /Fo$(INTDIR)\\ /Fd$(INTDIR)\\ /FD /c 
  +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I ../../lib/apr/include /D WIN32 /D\
  + NDEBUG /D _WINDOWS /Fp$(INTDIR)\ApacheOS.pch /YX /Fo$(INTDIR)\\\
  + /Fd$(INTDIR)\\ /FD /c 
   CPP_OBJS=.\ApacheOSR/
   CPP_SBRS=.
  -
  -.c{$(CPP_OBJS)}.obj::
  -   $(CPP) @
  -   $(CPP_PROJ) $ 
  -
  -
  -.cpp{$(CPP_OBJS)}.obj::
  -   $(CPP) @
  -   $(CPP_PROJ) $ 
  -
  -
  -.cxx{$(CPP_OBJS)}.obj::
  -   $(CPP) @
  -   $(CPP_PROJ) $ 
  -
  -
  -.c{$(CPP_SBRS)}.sbr::
  -   $(CPP) @
  -   $(CPP_PROJ) $ 
  -
  -
  -.cpp{$(CPP_SBRS)}.sbr::
  -   $(CPP) @
  -   $(CPP_PROJ) $ 
  -
  -
  -.cxx{$(CPP_SBRS)}.sbr::
  -   $(CPP) @
  -   $(CPP_PROJ) $ 
  -
  -
   BSC32=bscmake.exe
   BSC32_FLAGS=/nologo /o$(OUTDIR)\ApacheOS.bsc 
   BSC32_SBRS= \
  @@ -128,12 +99,26 @@
   $(OUTDIR) :
   if not exist $(OUTDIR)/$(NULL) mkdir $(OUTDIR)
   
  -CPP=cl.exe
   CPP_PROJ=/nologo /MDd /W3 /GX /Z7 /Od /I ../../lib/apr/include /D WIN32 
/D\
_DEBUG /D _WINDOWS /Fp$(INTDIR)\ApacheOS.pch /YX /Fo$(INTDIR)\\\
/Fd$(INTDIR)\\ /FD /c 
   CPP_OBJS=.\ApacheOSD/
   CPP_SBRS=.
  +BSC32=bscmake.exe
  +BSC32_FLAGS=/nologo /o$(OUTDIR)\ApacheOS.bsc 
  +BSC32_SBRS= \
  + 
  +LIB32=link.exe -lib
  +LIB32_FLAGS=/nologo /out:$(OUTDIR)\ApacheOS.lib 
  +LIB32_OBJS= \
  + $(INTDIR)\os.obj
  +
  +$(OUTDIR)\ApacheOS.lib : $(OUTDIR) $(DEF_FILE) $(LIB32_OBJS)
  +$(LIB32) @
  +  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
  +
  +
  +!ENDIF 
   
   .c{$(CPP_OBJS)}.obj::
  $(CPP) @
  @@ -165,22 +150,6 @@
  $(CPP_PROJ) $ 
   
   
  -BSC32=bscmake.exe
  -BSC32_FLAGS=/nologo /o$(OUTDIR)\ApacheOS.bsc 
  -BSC32_SBRS= \
  - 
  -LIB32=link.exe -lib
  -LIB32_FLAGS=/nologo /out:$(OUTDIR)\ApacheOS.lib 
  -LIB32_OBJS= \
  - $(INTDIR)\os.obj
  -
  -$(OUTDIR)\ApacheOS.lib : $(OUTDIR) $(DEF_FILE) $(LIB32_OBJS)
  -$(LIB32) @
  -  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
  -
  -
  -!ENDIF 
  -
   
   !IF $(CFG) == ApacheOS - Win32 Release || $(CFG) ==\
ApacheOS - Win32 Debug
  @@ -189,10 +158,14 @@
   !IF  $(CFG) == ApacheOS - Win32 Release
   
   DEP_CPP_OS_C0=\
  + ..\..\lib\apr\include\apr_errno.h\
  + ..\..\lib\apr\include\apr_general.h\
  + ..\..\lib\apr\include\apr_win.h\
.\os.h\
  + {$(INCLUDE)}sys\types.h\

   NODEP_CPP_OS_C0=\
  - .\apr_win.h\
  + ..\..\lib\apr\include\apr.h\

   
   $(INTDIR)\os.obj : $(SOURCE) $(DEP_CPP_OS_C0) $(INTDIR)
  @@ -201,6 +174,8 @@
   !ELSEIF  $(CFG) == ApacheOS - Win32 Debug
   
   DEP_CPP_OS_C0=\
  + ..\..\lib\apr\include\apr_errno.h\
  + ..\..\lib\apr\include\apr_general.h\
..\..\lib\apr\include\apr_win.h\
.\os.h\

  
  
  


cvs commit: apache-2.0/src/lib/apr/network_io/win32 sendrecv.c

2000-01-24 Thread stoddard
stoddard00/01/24 12:58:32

  Modified:src/lib/apr aprlib.mak aprlib.dsp
   src/lib/apr/network_io/win32 sendrecv.c
  Log:
  More sendfile tweaks for Windows. Still not ready for prime time.
  
  Revision  ChangesPath
  1.7   +9 -211apache-2.0/src/lib/apr/aprlib.mak
  
  Index: aprlib.mak
  ===
  RCS file: /home/cvs/apache-2.0/src/lib/apr/aprlib.mak,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- aprlib.mak2000/01/17 23:16:02 1.6
  +++ aprlib.mak2000/01/24 20:58:13 1.7
  @@ -105,8 +105,8 @@
   LINK32=link.exe
   LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
  - odbccp32.lib ws2_32.lib /nologo /subsystem:windows /dll /incremental:no\
  - /pdb:$(OUTDIR)\aprlib.pdb /machine:I386 /def:.\aprlib.def\
  + odbccp32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll\
  + /incremental:no /pdb:$(OUTDIR)\aprlib.pdb /machine:I386 
/def:.\aprlib.def\
/out:$(OUTDIR)\aprlib.dll /implib:$(OUTDIR)\aprlib.lib 
   DEF_FILE= \
.\aprlib.def
  @@ -232,9 +232,10 @@
   LINK32=link.exe
   LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
  - odbccp32.lib ws2_32.lib /nologo /subsystem:windows /dll /incremental:yes\
  - /pdb:$(OUTDIR)\aprlib.pdb /debug /machine:I386 /def:.\aprlib.def\
  - /out:$(OUTDIR)\aprlib.dll /implib:$(OUTDIR)\aprlib.lib /pdbtype:sept 
  + odbccp32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll\
  + /incremental:yes /pdb:$(OUTDIR)\aprlib.pdb /debug /machine:I386\
  + /def:.\aprlib.def /out:$(OUTDIR)\aprlib.dll 
/implib:$(OUTDIR)\aprlib.lib\
  + /pdbtype:sept 
   DEF_FILE= \
.\aprlib.def
   LINK32_OBJS= \
  @@ -328,11 +329,7 @@
.\include\apr_win.h\
.\include\apr_winconfig.h\
.\time\win32\atime.h\
  - {$(INCLUDE)}sys\types.h\

  -NODEP_CPP_ACCES=\
  - .\include\apr.h\
  - 
   
   $(INTDIR)\access.obj : $(SOURCE) $(DEP_CPP_ACCES) $(INTDIR)
$(CPP) $(CPP_PROJ) $(SOURCE)
  @@ -371,11 +368,6 @@
.\include\apr_time.h\
.\include\apr_win.h\
.\include\apr_winconfig.h\
  - {$(INCLUDE)}sys\types.h\
  - 
  -NODEP_CPP_APR_C=\
  - .\include\apr.h\
  - .\lib\apr_config.h\

   
   $(INTDIR)\apr_cpystrn.obj : $(SOURCE) $(DEP_CPP_APR_C) $(INTDIR)
  @@ -403,25 +395,10 @@
   
   SOURCE=.\lib\apr_execve.c
   
  -!IF  $(CFG) == aprlib - Win32 Release
  -
  -NODEP_CPP_APR_E=\
  - .\lib\apr_config.h\
  - 
  -
  -$(INTDIR)\apr_execve.obj : $(SOURCE) $(INTDIR)
  - $(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  $(CFG) == aprlib - Win32 Debug
  -
  -
   $(INTDIR)\apr_execve.obj : $(SOURCE) $(INTDIR)
$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ENDIF 
  -
   SOURCE=.\lib\apr_fnmatch.c
   
   !IF  $(CFG) == aprlib - Win32 Release
  @@ -435,11 +412,6 @@
.\include\apr_thread_proc.h\
.\include\apr_time.h\
.\include\apr_win.h\
  - {$(INCLUDE)}sys\types.h\
  - 
  -NODEP_CPP_APR_F=\
  - .\include\apr.h\
  - .\lib\apr_config.h\

   
   $(INTDIR)\apr_fnmatch.obj : $(SOURCE) $(DEP_CPP_APR_F) $(INTDIR)
  @@ -478,11 +450,6 @@
.\include\apr_time.h\
.\include\apr_win.h\
.\include\apr_winconfig.h\
  - {$(INCLUDE)}sys\types.h\
  - 
  -NODEP_CPP_APR_G=\
  - .\include\apr.h\
  - .\lib\apr_config.h\

   
   $(INTDIR)\apr_getpass.obj : $(SOURCE) $(DEP_CPP_APR_G) $(INTDIR)
  @@ -521,12 +488,7 @@
.\include\apr_thread_proc.h\
.\include\apr_time.h\
.\include\apr_win.h\
  - {$(INCLUDE)}sys\types.h\

  -NODEP_CPP_APR_M=\
  - .\include\apr.h\
  - .\lib\apr_config.h\
  - 
   
   $(INTDIR)\apr_md5.obj : $(SOURCE) $(DEP_CPP_APR_M) $(INTDIR)
$(CPP) $(CPP_PROJ) $(SOURCE)
  @@ -568,12 +530,6 @@
.\include\apr_win.h\
.\include\apr_winconfig.h\
.\misc\win32\misc.h\
  - {$(INCLUDE)}sys\stat.h\
  - {$(INCLUDE)}sys\types.h\
  - 
  -NODEP_CPP_APR_P=\
  - .\include\apr.h\
  - .\lib\apr_config.h\

   
   $(INTDIR)\apr_pools.obj : $(SOURCE) $(DEP_CPP_APR_P) $(INTDIR)
  @@ -616,12 +572,6 @@
.\include\apr_time.h\
.\include\apr_win.h\
.\include\apr_winconfig.h\
  - {$(INCLUDE)}sys\types.h\
  - 
  -NODEP_CPP_APR_S=\
  - .\include\apr.h\
  - .\lib\apr_config.h\
  - .\lib\http_log.h\

   CPP_SWITCHES=/nologo /MT /W3 /GX /O2 /I ./include /I ./inc /I\
./misc/win32 /I ./file_io/win32 /I ./misc/win32/ /I 
./file_io/win32/ /D\
  @@ -660,9 +610,6 @@
   !ENDIF 
   
   SOURCE=.\lib\apr_snprintf.c
  -
  -!IF  $(CFG) == aprlib - Win32 Release
  -
   DEP_CPP_APR_SN=\
.\include\apr_errno.h\
.\include\apr_file_io.h\
  @@ -672,36