OS2 was chasing os2errno.h which we hid in a private platform directory,

but apr_errno.h is public. It also called in <os.h> with possibly inappropriate headers, and if os2.h follows any other header's usual conventions, calling it the second time for more declarations can be dicey. Relocated <os2.h> into apr.h.in (accessable to all, since it's later leveraged by most), which simplifies a bunch of code, and relocate all of the os2errno values into apr_errno.h for APR_STATUS_IS_FOO tests. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@61156 13f79535-47bb-0310-9956-ffa450edef68
author: wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> 2001-01-28 15:30:32 +0000
committer: wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> 2001-01-28 15:30:32 +0000
commit: 59390e54e5b10995256cdea6e687a78f5d3cd4c8 (patch)
tree: 843434e4345725b973f90ace72dc1325b5fc3719
parent: d03b24c71bc3568f1e50c062eabd19edf3ad0f9c (diff)
download: libapr-59390e54e5b10995256cdea6e687a78f5d3cd4c8.tar.gz
31 files changed, 1576 insertions, 303 deletions
diff --git a/apr.dsp b/apr.dsp
index 4039aa632..e2e39b320 100644
--- a/apr.dsp
+++ b/apr.dsp
@@ -1,5 +1,5 @@
 # Microsoft Developer Studio Project File - Name="apr" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# Microsoft Developer Studio Generated Build File, Format Version 5.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
@@ -22,7 +22,6 @@ CFG=apr - Win32 Debug
 !MESSAGE 
 
 # Begin Project
-# PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
 CPP=cl.exe
@@ -64,8 +63,8 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "LibD"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# 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 "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fd"LibD\apr" /FD /c
+# 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 "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fd"LibD\apr" /FD /c
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
diff --git a/apr.mak b/apr.mak
index 84d3d88f9..ecf88f341 100644
--- a/apr.mak
+++ b/apr.mak
@@ -68,6 +68,7 @@ CLEAN :
 	-@erase "$(INTDIR)\fullrw.obj"
 	-@erase "$(INTDIR)\getopt.obj"
 	-@erase "$(INTDIR)\getuuid.obj"
+	-@erase "$(INTDIR)\groupinfo.obj"
 	-@erase "$(INTDIR)\inet_ntop.obj"
 	-@erase "$(INTDIR)\locks.obj"
 	-@erase "$(INTDIR)\misc.obj"
@@ -90,6 +91,7 @@ CLEAN :
 	-@erase "$(INTDIR)\threadpriv.obj"
 	-@erase "$(INTDIR)\time.obj"
 	-@erase "$(INTDIR)\timestr.obj"
+	-@erase "$(INTDIR)\userinfo.obj"
 	-@erase "$(INTDIR)\utf8_ucs2.obj"
 	-@erase "$(INTDIR)\uuid.obj"
 	-@erase "$(OUTDIR)\apr.lib"
@@ -166,6 +168,7 @@ LIB32_OBJS= \
 	"$(INTDIR)\fullrw.obj" \
 	"$(INTDIR)\getopt.obj" \
 	"$(INTDIR)\getuuid.obj" \
+	"$(INTDIR)\groupinfo.obj" \
 	"$(INTDIR)\inet_ntop.obj" \
 	"$(INTDIR)\locks.obj" \
 	"$(INTDIR)\misc.obj" \
@@ -188,6 +191,7 @@ LIB32_OBJS= \
 	"$(INTDIR)\threadpriv.obj" \
 	"$(INTDIR)\time.obj" \
 	"$(INTDIR)\timestr.obj" \
+	"$(INTDIR)\userinfo.obj" \
 	"$(INTDIR)\utf8_ucs2.obj" \
 	"$(INTDIR)\uuid.obj"
 
@@ -240,6 +244,7 @@ CLEAN :
 	-@erase "$(INTDIR)\fullrw.obj"
 	-@erase "$(INTDIR)\getopt.obj"
 	-@erase "$(INTDIR)\getuuid.obj"
+	-@erase "$(INTDIR)\groupinfo.obj"
 	-@erase "$(INTDIR)\inet_ntop.obj"
 	-@erase "$(INTDIR)\locks.obj"
 	-@erase "$(INTDIR)\misc.obj"
@@ -262,6 +267,7 @@ CLEAN :
 	-@erase "$(INTDIR)\threadpriv.obj"
 	-@erase "$(INTDIR)\time.obj"
 	-@erase "$(INTDIR)\timestr.obj"
+	-@erase "$(INTDIR)\userinfo.obj"
 	-@erase "$(INTDIR)\utf8_ucs2.obj"
 	-@erase "$(INTDIR)\uuid.obj"
 	-@erase "$(OUTDIR)\apr.lib"
@@ -338,6 +344,7 @@ LIB32_OBJS= \
 	"$(INTDIR)\fullrw.obj" \
 	"$(INTDIR)\getopt.obj" \
 	"$(INTDIR)\getuuid.obj" \
+	"$(INTDIR)\groupinfo.obj" \
 	"$(INTDIR)\inet_ntop.obj" \
 	"$(INTDIR)\locks.obj" \
 	"$(INTDIR)\misc.obj" \
@@ -360,6 +367,7 @@ LIB32_OBJS= \
 	"$(INTDIR)\threadpriv.obj" \
 	"$(INTDIR)\time.obj" \
 	"$(INTDIR)\timestr.obj" \
+	"$(INTDIR)\userinfo.obj" \
 	"$(INTDIR)\utf8_ucs2.obj" \
 	"$(INTDIR)\uuid.obj"
 
@@ -395,6 +403,7 @@ DEP_CPP_TIME_=\
 	".\include\apr.h"\
 	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
 	".\include\apr_lib.h"\
@@ -404,6 +413,8 @@ DEP_CPP_TIME_=\
 	".\include\apr_portable.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
 	".\include\arch\win32\apr_private.h"\
 	".\include\arch\win32\atime.h"\
 	".\network_io\os2\os2nerrno.h"\
@@ -418,6 +429,7 @@ DEP_CPP_TIMES=\
 	".\include\apr.h"\
 	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
 	".\include\apr_lock.h"\
 	".\include\apr_network_io.h"\
@@ -425,6 +437,8 @@ DEP_CPP_TIMES=\
 	".\include\apr_portable.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
 	".\include\arch\win32\apr_private.h"\
 	".\include\arch\win32\atime.h"\
 	".\network_io\os2\os2nerrno.h"\
@@ -470,11 +484,14 @@ SOURCE=.\strings\apr_snprintf.c
 DEP_CPP_APR_S=\
 	".\include\apr.h"\
 	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
 	".\include\apr_lib.h"\
 	".\include\apr_network_io.h"\
 	".\include\apr_pools.h"\
 	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
 	".\include\arch\win32\apr_private.h"\
 	".\network_io\os2\os2nerrno.h"\
 	
@@ -588,6 +605,7 @@ DEP_CPP_ERROR=\
 	".\include\apr.h"\
 	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
 	".\include\apr_getopt.h"\
@@ -596,6 +614,8 @@ DEP_CPP_ERROR=\
 	".\include\apr_strings.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
 	".\include\arch\unix\misc.h"\
 	".\include\arch\win32\apr_private.h"\
 	".\network_io\os2\os2nerrno.h"\
@@ -610,6 +630,7 @@ SOURCE=.\misc\unix\getopt.c
 DEP_CPP_GETOP=\
 	".\include\apr.h"\
 	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
 	".\include\apr_getopt.h"\
@@ -617,6 +638,8 @@ DEP_CPP_GETOP=\
 	".\include\apr_strings.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
 	".\include\arch\unix\misc.h"\
 	".\include\arch\win32\apr_private.h"\
 	".\network_io\os2\os2nerrno.h"\
@@ -644,12 +667,15 @@ SOURCE=.\misc\win32\misc.c
 DEP_CPP_MISC_=\
 	".\include\apr.h"\
 	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
 	".\include\apr_getopt.h"\
 	".\include\apr_pools.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
 	".\include\arch\unix\misc.h"\
 	".\include\arch\win32\apr_private.h"\
 	".\network_io\os2\os2nerrno.h"\
@@ -663,12 +689,15 @@ SOURCE=.\misc\win32\names.c
 DEP_CPP_NAMES=\
 	".\include\apr.h"\
 	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
 	".\include\apr_lib.h"\
 	".\include\apr_pools.h"\
 	".\include\apr_strings.h"\
 	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
 	".\include\arch\win32\apr_private.h"\
 	".\network_io\os2\os2nerrno.h"\
 	
@@ -696,6 +725,7 @@ SOURCE=.\misc\unix\start.c
 DEP_CPP_START=\
 	".\include\apr.h"\
 	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
 	".\include\apr_getopt.h"\
@@ -703,6 +733,8 @@ DEP_CPP_START=\
 	".\include\apr_pools.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
 	".\include\arch\unix\misc.h"\
 	".\include\arch\win32\apr_private.h"\
 	".\include\arch\win32\locks.h"\
@@ -733,6 +765,7 @@ DEP_CPP_DIR_C=\
 	".\include\apr.h"\
 	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
 	".\include\apr_getopt.h"\
@@ -744,6 +777,8 @@ DEP_CPP_DIR_C=\
 	".\include\apr_tables.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
 	".\include\apr_xlate.h"\
 	".\include\arch\unix\i18n.h"\
 	".\include\arch\unix\misc.h"\
@@ -761,6 +796,7 @@ SOURCE=.\file_io\unix\fileacc.c
 DEP_CPP_FILEA=\
 	".\include\apr.h"\
 	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
 	".\include\apr_getopt.h"\
@@ -770,6 +806,8 @@ DEP_CPP_FILEA=\
 	".\include\apr_tables.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
 	".\include\apr_xlate.h"\
 	".\include\arch\unix\i18n.h"\
 	".\include\arch\unix\misc.h"\
@@ -787,6 +825,7 @@ SOURCE=.\file_io\win32\filedup.c
 DEP_CPP_FILED=\
 	".\include\apr.h"\
 	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
 	".\include\apr_getopt.h"\
@@ -796,6 +835,8 @@ DEP_CPP_FILED=\
 	".\include\apr_tables.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
 	".\include\apr_xlate.h"\
 	".\include\arch\unix\i18n.h"\
 	".\include\arch\unix\misc.h"\
@@ -813,14 +854,18 @@ SOURCE=.\file_io\win32\filestat.c
 DEP_CPP_FILES=\
 	".\include\apr.h"\
 	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
 	".\include\apr_getopt.h"\
 	".\include\apr_lock.h"\
 	".\include\apr_pools.h"\
+	".\include\apr_strings.h"\
 	".\include\apr_tables.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
 	".\include\apr_xlate.h"\
 	".\include\arch\unix\i18n.h"\
 	".\include\arch\unix\misc.h"\
@@ -839,6 +884,7 @@ SOURCE=.\file_io\win32\flock.c
 DEP_CPP_FLOCK=\
 	".\include\apr.h"\
 	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
 	".\include\apr_getopt.h"\
@@ -847,6 +893,8 @@ DEP_CPP_FLOCK=\
 	".\include\apr_tables.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
 	".\include\apr_xlate.h"\
 	".\include\arch\unix\i18n.h"\
 	".\include\arch\unix\misc.h"\
@@ -864,9 +912,12 @@ SOURCE=.\file_io\unix\fullrw.c
 DEP_CPP_FULLR=\
 	".\include\apr.h"\
 	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
 	".\include\apr_pools.h"\
 	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
 	".\network_io\os2\os2nerrno.h"\
 	
 
@@ -880,6 +931,7 @@ DEP_CPP_OPEN_=\
 	".\include\apr.h"\
 	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
 	".\include\apr_getopt.h"\
@@ -891,6 +943,8 @@ DEP_CPP_OPEN_=\
 	".\include\apr_tables.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
 	".\include\apr_xlate.h"\
 	".\include\arch\unix\i18n.h"\
 	".\include\arch\unix\misc.h"\
@@ -907,6 +961,7 @@ SOURCE=.\file_io\win32\pipe.c
 DEP_CPP_PIPE_=\
 	".\include\apr.h"\
 	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
 	".\include\apr_getopt.h"\
@@ -916,6 +971,8 @@ DEP_CPP_PIPE_=\
 	".\include\apr_tables.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
 	".\include\apr_xlate.h"\
 	".\include\arch\unix\i18n.h"\
 	".\include\arch\unix\misc.h"\
@@ -932,6 +989,7 @@ SOURCE=.\file_io\win32\readwrite.c
 DEP_CPP_READW=\
 	".\include\apr.h"\
 	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
 	".\include\apr_getopt.h"\
@@ -941,6 +999,8 @@ DEP_CPP_READW=\
 	".\include\apr_tables.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
 	".\include\apr_xlate.h"\
 	".\include\arch\unix\i18n.h"\
 	".\include\arch\unix\misc.h"\
@@ -959,6 +1019,7 @@ SOURCE=.\file_io\win32\seek.c
 DEP_CPP_SEEK_=\
 	".\include\apr.h"\
 	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
 	".\include\apr_getopt.h"\
@@ -967,6 +1028,8 @@ DEP_CPP_SEEK_=\
 	".\include\apr_tables.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
 	".\include\apr_xlate.h"\
 	".\include\arch\unix\i18n.h"\
 	".\include\arch\unix\misc.h"\
@@ -984,6 +1047,7 @@ DEP_CPP_LOCKS=\
 	".\include\apr.h"\
 	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
 	".\include\apr_lock.h"\
@@ -993,6 +1057,8 @@ DEP_CPP_LOCKS=\
 	".\include\apr_strings.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
 	".\include\arch\win32\locks.h"\
 	".\network_io\os2\os2nerrno.h"\
 	
@@ -1006,11 +1072,14 @@ SOURCE=.\network_io\unix\inet_ntop.c
 DEP_CPP_INET_=\
 	".\include\apr.h"\
 	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
 	".\include\apr_network_io.h"\
 	".\include\apr_pools.h"\
 	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
 	".\include\arch\win32\apr_private.h"\
 	".\include\arch\win32\networkio.h"\
 	".\network_io\os2\os2nerrno.h"\
@@ -1025,12 +1094,15 @@ SOURCE=.\network_io\win32\poll.c
 DEP_CPP_POLL_=\
 	".\include\apr.h"\
 	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
 	".\include\apr_lib.h"\
 	".\include\apr_network_io.h"\
 	".\include\apr_pools.h"\
 	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
 	".\include\arch\win32\networkio.h"\
 	".\network_io\os2\os2nerrno.h"\
 	
@@ -1044,6 +1116,7 @@ SOURCE=.\network_io\win32\sendrecv.c
 DEP_CPP_SENDR=\
 	".\include\apr.h"\
 	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
 	".\include\apr_getopt.h"\
@@ -1054,6 +1127,8 @@ DEP_CPP_SENDR=\
 	".\include\apr_tables.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
 	".\include\apr_xlate.h"\
 	".\include\arch\unix\i18n.h"\
 	".\include\arch\unix\misc.h"\
@@ -1072,6 +1147,7 @@ SOURCE=.\network_io\win32\sockaddr.c
 DEP_CPP_SOCKA=\
 	".\include\apr.h"\
 	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
 	".\include\apr_lib.h"\
@@ -1079,6 +1155,8 @@ DEP_CPP_SOCKA=\
 	".\include\apr_pools.h"\
 	".\include\apr_strings.h"\
 	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
 	".\include\arch\win32\networkio.h"\
 	".\network_io\os2\os2nerrno.h"\
 	".\network_io\unix\sa_common.c"\
@@ -1094,6 +1172,7 @@ DEP_CPP_SOCKE=\
 	".\include\apr.h"\
 	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
 	".\include\apr_lib.h"\
@@ -1103,6 +1182,8 @@ DEP_CPP_SOCKE=\
 	".\include\apr_portable.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
 	".\include\arch\win32\networkio.h"\
 	".\network_io\os2\os2nerrno.h"\
 	
@@ -1116,12 +1197,15 @@ SOURCE=.\network_io\win32\sockopt.c
 DEP_CPP_SOCKO=\
 	".\include\apr.h"\
 	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
 	".\include\apr_network_io.h"\
 	".\include\apr_pools.h"\
 	".\include\apr_strings.h"\
 	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
 	".\include\arch\win32\networkio.h"\
 	".\network_io\os2\os2nerrno.h"\
 	
@@ -1136,6 +1220,7 @@ DEP_CPP_PROC_=\
 	".\include\apr.h"\
 	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
 	".\include\apr_getopt.h"\
@@ -1147,6 +1232,8 @@ DEP_CPP_PROC_=\
 	".\include\apr_tables.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
 	".\include\apr_xlate.h"\
 	".\include\arch\unix\i18n.h"\
 	".\include\arch\unix\misc.h"\
@@ -1164,6 +1251,7 @@ SOURCE=.\threadproc\win32\signals.c
 DEP_CPP_SIGNA=\
 	".\include\apr.h"\
 	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
 	".\include\apr_getopt.h"\
@@ -1172,6 +1260,8 @@ DEP_CPP_SIGNA=\
 	".\include\apr_tables.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
 	".\include\apr_xlate.h"\
 	".\include\arch\unix\i18n.h"\
 	".\include\arch\unix\misc.h"\
@@ -1191,6 +1281,7 @@ DEP_CPP_THREA=\
 	".\include\apr.h"\
 	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
 	".\include\apr_lib.h"\
@@ -1200,6 +1291,8 @@ DEP_CPP_THREA=\
 	".\include\apr_portable.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
 	".\include\arch\win32\apr_private.h"\
 	".\include\arch\win32\threadproc.h"\
 	".\network_io\os2\os2nerrno.h"\
@@ -1215,6 +1308,7 @@ DEP_CPP_THREAD=\
 	".\include\apr.h"\
 	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
 	".\include\apr_lib.h"\
@@ -1224,6 +1318,8 @@ DEP_CPP_THREAD=\
 	".\include\apr_portable.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
 	".\include\arch\win32\apr_private.h"\
 	".\include\arch\win32\threadproc.h"\
 	".\network_io\os2\os2nerrno.h"\
@@ -1239,6 +1335,7 @@ DEP_CPP_DSO_C=\
 	".\include\apr.h"\
 	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
 	".\include\apr_getopt.h"\
@@ -1248,6 +1345,8 @@ DEP_CPP_DSO_C=\
 	".\include\apr_tables.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
 	".\include\apr_xlate.h"\
 	".\include\arch\unix\i18n.h"\
 	".\include\arch\unix\misc.h"\
@@ -1266,6 +1365,7 @@ DEP_CPP_APR_P=\
 	".\include\apr.h"\
 	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
 	".\include\apr_hash.h"\
@@ -1277,6 +1377,8 @@ DEP_CPP_APR_P=\
 	".\include\apr_strings.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
 	".\include\arch\win32\apr_private.h"\
 	".\network_io\os2\os2nerrno.h"\
 	
@@ -1321,10 +1423,13 @@ SOURCE=.\mmap\unix\common.c
 DEP_CPP_COMMO=\
 	".\include\apr.h"\
 	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
 	".\include\apr_mmap.h"\
 	".\include\apr_pools.h"\
 	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
 	".\include\arch\win32\apr_private.h"\
 	".\network_io\os2\os2nerrno.h"\
 	
@@ -1339,6 +1444,7 @@ DEP_CPP_MMAP_=\
 	".\include\apr.h"\
 	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
 	".\include\apr_getopt.h"\
@@ -1350,6 +1456,8 @@ DEP_CPP_MMAP_=\
 	".\include\apr_tables.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
 	".\include\apr_xlate.h"\
 	".\include\arch\unix\i18n.h"\
 	".\include\arch\unix\misc.h"\
@@ -1362,6 +1470,56 @@ DEP_CPP_MMAP_=\
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+SOURCE=.\user\win32\groupinfo.c
+DEP_CPP_GROUP=\
+	".\include\apr.h"\
+	".\include\apr_dso.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
+	".\include\apr_file_io.h"\
+	".\include\apr_lock.h"\
+	".\include\apr_network_io.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_portable.h"\
+	".\include\apr_strings.h"\
+	".\include\apr_thread_proc.h"\
+	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
+	".\include\arch\win32\apr_private.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\groupinfo.obj" : $(SOURCE) $(DEP_CPP_GROUP) "$(INTDIR)"\
+ ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\user\win32\userinfo.c
+DEP_CPP_USERI=\
+	".\include\apr.h"\
+	".\include\apr_dso.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
+	".\include\apr_file_io.h"\
+	".\include\apr_lock.h"\
+	".\include\apr_network_io.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_portable.h"\
+	".\include\apr_strings.h"\
+	".\include\apr_thread_proc.h"\
+	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
+	".\include\arch\win32\apr_private.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\userinfo.obj" : $(SOURCE) $(DEP_CPP_USERI) "$(INTDIR)"\
+ ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
 SOURCE=.\include\apr.hw
 
 !IF  "$(CFG)" == "apr - Win32 Release"
diff --git a/dso/os2/dso.c b/dso/os2/dso.c
index d3d6a17e5..bceef2e06 100644
--- a/dso/os2/dso.c
+++ b/dso/os2/dso.c
@@ -54,8 +54,6 @@
 
 #include "dso.h"
 #include "apr_strings.h"
-#define INCL_DOS
-#include <os2.h>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/file_io/os2/dir.c b/file_io/os2/dir.c
index fc7c43223..61a21269c 100644
--- a/file_io/os2/dir.c
+++ b/file_io/os2/dir.c
@@ -58,9 +58,6 @@
 #include "apr_strings.h"
 #include <string.h>
 
-#define INCL_DOS
-#include <os2.h>
-
 static apr_status_t dir_cleanup(void *thedir)
 {
     apr_dir_t *dir = thedir;
diff --git a/file_io/os2/filedup.c b/file_io/os2/filedup.c
index ee52fcddb..8bece3dce 100644
--- a/file_io/os2/filedup.c
+++ b/file_io/os2/filedup.c
@@ -58,9 +58,6 @@
 #include "apr_strings.h"
 #include <string.h>
 
-#define INCL_DOS
-#include <os2.h>
-
 apr_status_t apr_dupfile(apr_file_t **new_file, apr_file_t *old_file, apr_pool_t *p)
 {
     int rv;
diff --git a/file_io/os2/filestat.c b/file_io/os2/filestat.c
index 8a28e1769..ec055908a 100644
--- a/file_io/os2/filestat.c
+++ b/file_io/os2/filestat.c
@@ -58,7 +58,6 @@
 #include "apr_file_io.h"
 #include "apr_lib.h"
 #include <sys/time.h>
-#include <os2.h>
 
 
 static void FS3_to_finfo(apr_finfo_t *finfo, FILESTATUS3 *fstatus)
diff --git a/file_io/os2/maperrorcode.c b/file_io/os2/maperrorcode.c
index 5fa398151..36cba058d 100644
--- a/file_io/os2/maperrorcode.c
+++ b/file_io/os2/maperrorcode.c
@@ -57,9 +57,7 @@
 #include "apr_file_io.h"
 #include <errno.h>
 #include <string.h>
-#include <os2.h>
-#include "../../network_io/os2/os2calls.h"
-
+#include "apr_errno.h"
 
 static int errormap[][2] = {
     { NO_ERROR,                   APR_SUCCESS      },
diff --git a/file_io/os2/readwrite.c b/file_io/os2/readwrite.c
index 282766a43..f6dbd0255 100644
--- a/file_io/os2/readwrite.c
+++ b/file_io/os2/readwrite.c
@@ -59,7 +59,6 @@
 #include "apr_file_io.h"
 #include "apr_lib.h"
 
-#include <os2.h>
 #include <malloc.h>
 
 apr_status_t apr_read(apr_file_t *thefile, void *buf, apr_size_t *nbytes)
diff --git a/file_io/os2/seek.c b/file_io/os2/seek.c
index fa1d6792b..076fe93bc 100644
--- a/file_io/os2/seek.c
+++ b/file_io/os2/seek.c
@@ -58,10 +58,6 @@
 #include <string.h>
 #include <io.h>
 
-#define INCL_DOS
-#include <os2.h>
-
-
 
 static apr_status_t setptr(apr_file_t *thefile, unsigned long pos )
 {
diff --git a/include/apr.h.in b/include/apr.h.in
index bb128b1f2..583e4bfdd 100644
--- a/include/apr.h.in
+++ b/include/apr.h.in
@@ -243,4 +243,10 @@ Sigfunc *apr_signal(int signo, Sigfunc * func);
 #endif /* !WEXITSTATUS */
 #endif /* HAVE_SYS_WAIT_H */
 
+#ifdef OS2
+#define INCL_DOS
+#define INCL_DOSERRORS
+#include <os2.h>
+#endif
+
 #endif /* APR_H */
diff --git a/include/apr_errno.h b/include/apr_errno.h
index 8cab6a2b5..de6e65809 100644
--- a/include/apr_errno.h
+++ b/include/apr_errno.h
@@ -457,8 +457,6 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
 
 #define INCL_DOSERRORS
 #define INCL_DOS
-#include <os2.h>
-#include "../network_io/os2/os2nerrno.h"
 /* And this needs to be greped away for good:
  */
 #define APR_OS2_STATUS(e) (APR_FROM_OS_ERROR(e))
@@ -466,6 +464,54 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
 #define APR_STATUS_IS_SUCCESS(s)           ((s) == APR_SUCCESS \
                 || (s) == APR_OS_START_SYSERR + NO_ERROR)
 
+/* These can't sit in a private header, so in spite of the extra size, 
+ * they need to be made available here.
+ */
+#define SOCBASEERR              10000
+#define SOCEPERM                (SOCBASEERR+1)             /* Not owner */
+#define SOCESRCH                (SOCBASEERR+3)             /* No such process */
+#define SOCEINTR                (SOCBASEERR+4)             /* Interrupted system call */
+#define SOCENXIO                (SOCBASEERR+6)             /* No such device or address */
+#define SOCEBADF                (SOCBASEERR+9)             /* Bad file number */
+#define SOCEACCES               (SOCBASEERR+13)            /* Permission denied */
+#define SOCEFAULT               (SOCBASEERR+14)            /* Bad address */
+#define SOCEINVAL               (SOCBASEERR+22)            /* Invalid argument */
+#define SOCEMFILE               (SOCBASEERR+24)            /* Too many open files */
+#define SOCEPIPE                (SOCBASEERR+32)            /* Broken pipe */
+#define SOCEOS2ERR              (SOCBASEERR+100)           /* OS/2 Error */
+#define SOCEWOULDBLOCK          (SOCBASEERR+35)            /* Operation would block */
+#define SOCEINPROGRESS          (SOCBASEERR+36)            /* Operation now in progress */
+#define SOCEALREADY             (SOCBASEERR+37)            /* Operation already in progress */
+#define SOCENOTSOCK             (SOCBASEERR+38)            /* Socket operation on non-socket */
+#define SOCEDESTADDRREQ         (SOCBASEERR+39)            /* Destination address required */
+#define SOCEMSGSIZE             (SOCBASEERR+40)            /* Message too long */
+#define SOCEPROTOTYPE           (SOCBASEERR+41)            /* Protocol wrong type for socket */
+#define SOCENOPROTOOPT          (SOCBASEERR+42)            /* Protocol not available */
+#define SOCEPROTONOSUPPORT      (SOCBASEERR+43)            /* Protocol not supported */
+#define SOCESOCKTNOSUPPORT      (SOCBASEERR+44)            /* Socket type not supported */
+#define SOCEOPNOTSUPP           (SOCBASEERR+45)            /* Operation not supported on socket */
+#define SOCEPFNOSUPPORT         (SOCBASEERR+46)            /* Protocol family not supported */
+#define SOCEAFNOSUPPORT         (SOCBASEERR+47)            /* Address family not supported by protocol family */
+#define SOCEADDRINUSE           (SOCBASEERR+48)            /* Address already in use */
+#define SOCEADDRNOTAVAIL        (SOCBASEERR+49)            /* Can't assign requested address */
+#define SOCENETDOWN             (SOCBASEERR+50)            /* Network is down */
+#define SOCENETUNREACH          (SOCBASEERR+51)            /* Network is unreachable */
+#define SOCENETRESET            (SOCBASEERR+52)            /* Network dropped connection on reset */
+#define SOCECONNABORTED         (SOCBASEERR+53)            /* Software caused connection abort */
+#define SOCECONNRESET           (SOCBASEERR+54)            /* Connection reset by peer */
+#define SOCENOBUFS              (SOCBASEERR+55)            /* No buffer space available */
+#define SOCEISCONN              (SOCBASEERR+56)            /* Socket is already connected */
+#define SOCENOTCONN             (SOCBASEERR+57)            /* Socket is not connected */
+#define SOCESHUTDOWN            (SOCBASEERR+58)            /* Can't send after socket shutdown */
+#define SOCETOOMANYREFS         (SOCBASEERR+59)            /* Too many references: can't splice */
+#define SOCETIMEDOUT            (SOCBASEERR+60)            /* Connection timed out */
+#define SOCECONNREFUSED         (SOCBASEERR+61)            /* Connection refused */
+#define SOCELOOP                (SOCBASEERR+62)            /* Too many levels of symbolic links */
+#define SOCENAMETOOLONG         (SOCBASEERR+63)            /* File name too long */
+#define SOCEHOSTDOWN            (SOCBASEERR+64)            /* Host is down */
+#define SOCEHOSTUNREACH         (SOCBASEERR+65)            /* No route to host */
+#define SOCENOTEMPTY            (SOCBASEERR+66)            /* Directory not empty */
+
 /* APR CANONICAL ERROR TESTS */
 #define APR_STATUS_IS_EACCES(s)         ((s) == APR_EACCES \
                 || (s) == APR_OS_START_SYSERR + ERROR_ACCESS_DENIED \
diff --git a/include/apr_portable.h b/include/apr_portable.h
index 24683fcd3..5eec7971d 100644
--- a/include/apr_portable.h
+++ b/include/apr_portable.h
@@ -103,8 +103,6 @@ typedef FILETIME              apr_os_imp_time_t;
 typedef SYSTEMTIME            apr_os_exp_time_t;
 
 #elif defined(OS2)
-#define INCL_DOS
-#include <os2.h>
 typedef HFILE                 apr_os_file_t;
 typedef HDIR                  apr_os_dir_t;
 typedef int                   apr_os_sock_t;
diff --git a/include/arch/os2/dso.h b/include/arch/os2/dso.h
index 1597c81d1..dd3e9223d 100644
--- a/include/arch/os2/dso.h
+++ b/include/arch/os2/dso.h
@@ -55,9 +55,6 @@
 #ifndef DSO_H
 #define DSO_H
 
-#define INCL_DOS
-#include <os2.h>
-
 #include "apr_private.h"
 #include "apr_general.h"
 #include "apr_pools.h"
diff --git a/include/arch/os2/fileio.h b/include/arch/os2/fileio.h
index d1abad34a..a34b05d85 100644
--- a/include/arch/os2/fileio.h
+++ b/include/arch/os2/fileio.h
@@ -55,10 +55,6 @@
 #ifndef FILE_IO_H
 #define FILE_IO_H
 
-#define INCL_DOS
-#define INCL_DOSERRORS
-#include <os2.h>
-
 #include "apr_private.h"
 #include "apr_general.h"
 #include "apr_lock.h"
diff --git a/include/arch/os2/locks.h b/include/arch/os2/locks.h
index 50ffdc652..6864e49be 100644
--- a/include/arch/os2/locks.h
+++ b/include/arch/os2/locks.h
@@ -57,8 +57,6 @@
 
 #include "apr_lock.h"
 #include "apr_file_io.h"
-#define INCL_DOS
-#include <os2.h>
 
 struct apr_lock_t {
     apr_pool_t *cntxt;
diff --git a/include/arch/os2/os2calls.h b/include/arch/os2/os2calls.h
index 8a8b83bd0..2dcb86c67 100644
--- a/include/arch/os2/os2calls.h
+++ b/include/arch/os2/os2calls.h
@@ -52,9 +52,9 @@
  * <http://www.apache.org/>.
  */
 
+#include "apr_errno.h"
 #include <sys/types.h>
 #include <sys/socket.h>
-#include "os2nerrno.h"
 
 extern int (*apr_os2_socket)(int, int, int);
 extern int (*apr_os2_select)(int *, int, int, int, long);
diff --git a/include/arch/os2/os2nerrno.h b/include/arch/os2/os2nerrno.h
deleted file mode 100644
index 0d6b444e2..000000000
--- a/include/arch/os2/os2nerrno.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef __OS2NERRNO_H
-#define __OS2NERRNO_H
-
-/* Error codes returned by above calls */
-#define SOCBASEERR              10000
-
-#define SOCEPERM                (SOCBASEERR+1)             /* Not owner */
-#define SOCESRCH                (SOCBASEERR+3)             /* No such process */
-#define SOCEINTR                (SOCBASEERR+4)             /* Interrupted system call */
-#define SOCENXIO                (SOCBASEERR+6)             /* No such device or address */
-#define SOCEBADF                (SOCBASEERR+9)             /* Bad file number */
-#define SOCEACCES               (SOCBASEERR+13)            /* Permission denied */
-#define SOCEFAULT               (SOCBASEERR+14)            /* Bad address */
-#define SOCEINVAL               (SOCBASEERR+22)            /* Invalid argument */
-#define SOCEMFILE               (SOCBASEERR+24)            /* Too many open files */
-#define SOCEPIPE                (SOCBASEERR+32)            /* Broken pipe */
-#define SOCEOS2ERR              (SOCBASEERR+100)           /* OS/2 Error */
-#define SOCEWOULDBLOCK          (SOCBASEERR+35)            /* Operation would block */
-#define SOCEINPROGRESS          (SOCBASEERR+36)            /* Operation now in progress */
-#define SOCEALREADY             (SOCBASEERR+37)            /* Operation already in progress */
-#define SOCENOTSOCK             (SOCBASEERR+38)            /* Socket operation on non-socket */
-#define SOCEDESTADDRREQ         (SOCBASEERR+39)            /* Destination address required */
-#define SOCEMSGSIZE             (SOCBASEERR+40)            /* Message too long */
-#define SOCEPROTOTYPE           (SOCBASEERR+41)            /* Protocol wrong type for socket */
-#define SOCENOPROTOOPT          (SOCBASEERR+42)            /* Protocol not available */
-#define SOCEPROTONOSUPPORT      (SOCBASEERR+43)            /* Protocol not supported */
-#define SOCESOCKTNOSUPPORT      (SOCBASEERR+44)            /* Socket type not supported */
-#define SOCEOPNOTSUPP           (SOCBASEERR+45)            /* Operation not supported on socket */
-#define SOCEPFNOSUPPORT         (SOCBASEERR+46)            /* Protocol family not supported */
-#define SOCEAFNOSUPPORT         (SOCBASEERR+47)            /* Address family not supported by protocol family */
-#define SOCEADDRINUSE           (SOCBASEERR+48)            /* Address already in use */
-#define SOCEADDRNOTAVAIL        (SOCBASEERR+49)            /* Can't assign requested address */
-#define SOCENETDOWN             (SOCBASEERR+50)            /* Network is down */
-#define SOCENETUNREACH          (SOCBASEERR+51)            /* Network is unreachable */
-#define SOCENETRESET            (SOCBASEERR+52)            /* Network dropped connection on reset */
-#define SOCECONNABORTED         (SOCBASEERR+53)            /* Software caused connection abort */
-#define SOCECONNRESET           (SOCBASEERR+54)            /* Connection reset by peer */
-#define SOCENOBUFS              (SOCBASEERR+55)            /* No buffer space available */
-#define SOCEISCONN              (SOCBASEERR+56)            /* Socket is already connected */
-#define SOCENOTCONN             (SOCBASEERR+57)            /* Socket is not connected */
-#define SOCESHUTDOWN            (SOCBASEERR+58)            /* Can't send after socket shutdown */
-#define SOCETOOMANYREFS         (SOCBASEERR+59)            /* Too many references: can't splice */
-#define SOCETIMEDOUT            (SOCBASEERR+60)            /* Connection timed out */
-#define SOCECONNREFUSED         (SOCBASEERR+61)            /* Connection refused */
-#define SOCELOOP                (SOCBASEERR+62)            /* Too many levels of symbolic links */
-#define SOCENAMETOOLONG         (SOCBASEERR+63)            /* File name too long */
-#define SOCEHOSTDOWN            (SOCBASEERR+64)            /* Host is down */
-#define SOCEHOSTUNREACH         (SOCBASEERR+65)            /* No route to host */
-#define SOCENOTEMPTY            (SOCBASEERR+66)            /* Directory not empty */
-
-#endif
diff --git a/libapr.dsp b/libapr.dsp
index 40ef2bec3..fbb6f0083 100644
--- a/libapr.dsp
+++ b/libapr.dsp
@@ -1,5 +1,5 @@
 # Microsoft Developer Studio Project File - Name="libapr" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# Microsoft Developer Studio Generated Build File, Format Version 5.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
@@ -22,7 +22,6 @@ CFG=libapr - Win32 Debug
 !MESSAGE 
 
 # Begin Project
-# PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
 CPP=cl.exe
@@ -68,8 +67,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# 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 "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fd"Debug\apr" /FD /c
+# 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 "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fd"Debug\apr" /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
diff --git a/libapr.mak b/libapr.mak
index d6f86ca89..925d4f8c7 100644
--- a/libapr.mak
+++ b/libapr.mak
@@ -39,17 +39,61 @@ ALL : "$(OUTDIR)\libapr.dll"
 
 !ELSE 
 
-ALL : "apr - Win32 Release" "$(OUTDIR)\libapr.dll"
+ALL : "$(OUTDIR)\libapr.dll"
 
 !ENDIF 
 
-!IF "$(RECURSE)" == "1" 
-CLEAN :"apr - Win32 ReleaseCLEAN" 
-!ELSE 
 CLEAN :
-!ENDIF 
-	-@erase "$(INTDIR)\libapr.idb"
-	-@erase "$(INTDIR)\libapr.obj"
+	-@erase "$(INTDIR)\access.obj"
+	-@erase "$(INTDIR)\apr.idb"
+	-@erase "$(INTDIR)\apr_cpystrn.obj"
+	-@erase "$(INTDIR)\apr_fnmatch.obj"
+	-@erase "$(INTDIR)\apr_getpass.obj"
+	-@erase "$(INTDIR)\apr_hash.obj"
+	-@erase "$(INTDIR)\apr_md5.obj"
+	-@erase "$(INTDIR)\apr_pools.obj"
+	-@erase "$(INTDIR)\apr_signal.obj"
+	-@erase "$(INTDIR)\apr_snprintf.obj"
+	-@erase "$(INTDIR)\apr_strings.obj"
+	-@erase "$(INTDIR)\apr_strnatcmp.obj"
+	-@erase "$(INTDIR)\apr_tables.obj"
+	-@erase "$(INTDIR)\common.obj"
+	-@erase "$(INTDIR)\dir.obj"
+	-@erase "$(INTDIR)\dso.obj"
+	-@erase "$(INTDIR)\errorcodes.obj"
+	-@erase "$(INTDIR)\fileacc.obj"
+	-@erase "$(INTDIR)\filedup.obj"
+	-@erase "$(INTDIR)\filestat.obj"
+	-@erase "$(INTDIR)\flock.obj"
+	-@erase "$(INTDIR)\fullrw.obj"
+	-@erase "$(INTDIR)\getopt.obj"
+	-@erase "$(INTDIR)\getuuid.obj"
+	-@erase "$(INTDIR)\groupinfo.obj"
+	-@erase "$(INTDIR)\inet_ntop.obj"
+	-@erase "$(INTDIR)\locks.obj"
+	-@erase "$(INTDIR)\misc.obj"
+	-@erase "$(INTDIR)\mmap.obj"
+	-@erase "$(INTDIR)\names.obj"
+	-@erase "$(INTDIR)\open.obj"
+	-@erase "$(INTDIR)\pipe.obj"
+	-@erase "$(INTDIR)\poll.obj"
+	-@erase "$(INTDIR)\proc.obj"
+	-@erase "$(INTDIR)\rand.obj"
+	-@erase "$(INTDIR)\readwrite.obj"
+	-@erase "$(INTDIR)\seek.obj"
+	-@erase "$(INTDIR)\sendrecv.obj"
+	-@erase "$(INTDIR)\signals.obj"
+	-@erase "$(INTDIR)\sockaddr.obj"
+	-@erase "$(INTDIR)\sockets.obj"
+	-@erase "$(INTDIR)\sockopt.obj"
+	-@erase "$(INTDIR)\start.obj"
+	-@erase "$(INTDIR)\thread.obj"
+	-@erase "$(INTDIR)\threadpriv.obj"
+	-@erase "$(INTDIR)\time.obj"
+	-@erase "$(INTDIR)\timestr.obj"
+	-@erase "$(INTDIR)\userinfo.obj"
+	-@erase "$(INTDIR)\utf8_ucs2.obj"
+	-@erase "$(INTDIR)\uuid.obj"
 	-@erase "$(OUTDIR)\libapr.dll"
 	-@erase "$(OUTDIR)\libapr.exp"
 	-@erase "$(OUTDIR)\libapr.lib"
@@ -62,7 +106,7 @@ CPP=cl.exe
 CPP_PROJ=/nologo /MD /W3 /O2 /I "./include" /I "./include/arch" /I\
  "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D\
  "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\"\
- /Fd"$(INTDIR)\libapr" /FD /c 
+ /Fd"$(INTDIR)\apr" /FD /c 
 CPP_OBJS=.\Release/
 CPP_SBRS=.
 
@@ -107,12 +151,57 @@ LINK32=link.exe
 LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo\
  /base:"0x6EE0000" /subsystem:windows /dll /incremental:no\
  /pdb:"$(OUTDIR)\libapr.pdb" /map:"$(INTDIR)\libapr.map" /machine:I386\
- /def:".\libapr.def" /out:"$(OUTDIR)\libapr.dll" /implib:"$(OUTDIR)\libapr.lib" 
-DEF_FILE= \
-	".\libapr.def"
+ /out:"$(OUTDIR)\libapr.dll" /implib:"$(OUTDIR)\libapr.lib" /OPT:NOREF 
 LINK32_OBJS= \
-	"$(INTDIR)\libapr.obj" \
-	".\LibR\apr.lib"
+	"$(INTDIR)\access.obj" \
+	"$(INTDIR)\apr_cpystrn.obj" \
+	"$(INTDIR)\apr_fnmatch.obj" \
+	"$(INTDIR)\apr_getpass.obj" \
+	"$(INTDIR)\apr_hash.obj" \
+	"$(INTDIR)\apr_md5.obj" \
+	"$(INTDIR)\apr_pools.obj" \
+	"$(INTDIR)\apr_signal.obj" \
+	"$(INTDIR)\apr_snprintf.obj" \
+	"$(INTDIR)\apr_strings.obj" \
+	"$(INTDIR)\apr_strnatcmp.obj" \
+	"$(INTDIR)\apr_tables.obj" \
+	"$(INTDIR)\common.obj" \
+	"$(INTDIR)\dir.obj" \
+	"$(INTDIR)\dso.obj" \
+	"$(INTDIR)\errorcodes.obj" \
+	"$(INTDIR)\fileacc.obj" \
+	"$(INTDIR)\filedup.obj" \
+	"$(INTDIR)\filestat.obj" \
+	"$(INTDIR)\flock.obj" \
+	"$(INTDIR)\fullrw.obj" \
+	"$(INTDIR)\getopt.obj" \
+	"$(INTDIR)\getuuid.obj" \
+	"$(INTDIR)\groupinfo.obj" \
+	"$(INTDIR)\inet_ntop.obj" \
+	"$(INTDIR)\locks.obj" \
+	"$(INTDIR)\misc.obj" \
+	"$(INTDIR)\mmap.obj" \
+	"$(INTDIR)\names.obj" \
+	"$(INTDIR)\open.obj" \
+	"$(INTDIR)\pipe.obj" \
+	"$(INTDIR)\poll.obj" \
+	"$(INTDIR)\proc.obj" \
+	"$(INTDIR)\rand.obj" \
+	"$(INTDIR)\readwrite.obj" \
+	"$(INTDIR)\seek.obj" \
+	"$(INTDIR)\sendrecv.obj" \
+	"$(INTDIR)\signals.obj" \
+	"$(INTDIR)\sockaddr.obj" \
+	"$(INTDIR)\sockets.obj" \
+	"$(INTDIR)\sockopt.obj" \
+	"$(INTDIR)\start.obj" \
+	"$(INTDIR)\thread.obj" \
+	"$(INTDIR)\threadpriv.obj" \
+	"$(INTDIR)\time.obj" \
+	"$(INTDIR)\timestr.obj" \
+	"$(INTDIR)\userinfo.obj" \
+	"$(INTDIR)\utf8_ucs2.obj" \
+	"$(INTDIR)\uuid.obj"
 
 "$(OUTDIR)\libapr.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -133,17 +222,62 @@ ALL : "$(OUTDIR)\libapr.dll"
 
 !ELSE 
 
-ALL : "apr - Win32 Debug" "$(OUTDIR)\libapr.dll"
+ALL : "$(OUTDIR)\libapr.dll"
 
 !ENDIF 
 
-!IF "$(RECURSE)" == "1" 
-CLEAN :"apr - Win32 DebugCLEAN" 
-!ELSE 
 CLEAN :
-!ENDIF 
-	-@erase "$(INTDIR)\libapr.idb"
-	-@erase "$(INTDIR)\libapr.obj"
+	-@erase "$(INTDIR)\access.obj"
+	-@erase "$(INTDIR)\apr.idb"
+	-@erase "$(INTDIR)\apr.pdb"
+	-@erase "$(INTDIR)\apr_cpystrn.obj"
+	-@erase "$(INTDIR)\apr_fnmatch.obj"
+	-@erase "$(INTDIR)\apr_getpass.obj"
+	-@erase "$(INTDIR)\apr_hash.obj"
+	-@erase "$(INTDIR)\apr_md5.obj"
+	-@erase "$(INTDIR)\apr_pools.obj"
+	-@erase "$(INTDIR)\apr_signal.obj"
+	-@erase "$(INTDIR)\apr_snprintf.obj"
+	-@erase "$(INTDIR)\apr_strings.obj"
+	-@erase "$(INTDIR)\apr_strnatcmp.obj"
+	-@erase "$(INTDIR)\apr_tables.obj"
+	-@erase "$(INTDIR)\common.obj"
+	-@erase "$(INTDIR)\dir.obj"
+	-@erase "$(INTDIR)\dso.obj"
+	-@erase "$(INTDIR)\errorcodes.obj"
+	-@erase "$(INTDIR)\fileacc.obj"
+	-@erase "$(INTDIR)\filedup.obj"
+	-@erase "$(INTDIR)\filestat.obj"
+	-@erase "$(INTDIR)\flock.obj"
+	-@erase "$(INTDIR)\fullrw.obj"
+	-@erase "$(INTDIR)\getopt.obj"
+	-@erase "$(INTDIR)\getuuid.obj"
+	-@erase "$(INTDIR)\groupinfo.obj"
+	-@erase "$(INTDIR)\inet_ntop.obj"
+	-@erase "$(INTDIR)\locks.obj"
+	-@erase "$(INTDIR)\misc.obj"
+	-@erase "$(INTDIR)\mmap.obj"
+	-@erase "$(INTDIR)\names.obj"
+	-@erase "$(INTDIR)\open.obj"
+	-@erase "$(INTDIR)\pipe.obj"
+	-@erase "$(INTDIR)\poll.obj"
+	-@erase "$(INTDIR)\proc.obj"
+	-@erase "$(INTDIR)\rand.obj"
+	-@erase "$(INTDIR)\readwrite.obj"
+	-@erase "$(INTDIR)\seek.obj"
+	-@erase "$(INTDIR)\sendrecv.obj"
+	-@erase "$(INTDIR)\signals.obj"
+	-@erase "$(INTDIR)\sockaddr.obj"
+	-@erase "$(INTDIR)\sockets.obj"
+	-@erase "$(INTDIR)\sockopt.obj"
+	-@erase "$(INTDIR)\start.obj"
+	-@erase "$(INTDIR)\thread.obj"
+	-@erase "$(INTDIR)\threadpriv.obj"
+	-@erase "$(INTDIR)\time.obj"
+	-@erase "$(INTDIR)\timestr.obj"
+	-@erase "$(INTDIR)\userinfo.obj"
+	-@erase "$(INTDIR)\utf8_ucs2.obj"
+	-@erase "$(INTDIR)\uuid.obj"
 	-@erase "$(OUTDIR)\libapr.dll"
 	-@erase "$(OUTDIR)\libapr.exp"
 	-@erase "$(OUTDIR)\libapr.lib"
@@ -157,7 +291,7 @@ CPP=cl.exe
 CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "./include" /I "./include/arch" /I\
  "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D\
  "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\"\
- /Fd"$(INTDIR)\libapr" /FD /c 
+ /Fd"$(INTDIR)\apr" /FD /c 
 CPP_OBJS=.\Debug/
 CPP_SBRS=.
 
@@ -202,12 +336,57 @@ LINK32=link.exe
 LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo\
  /base:"0x6EE0000" /subsystem:windows /dll /incremental:no\
  /pdb:"$(OUTDIR)\libapr.pdb" /map:"$(INTDIR)\libapr.map" /debug /machine:I386\
- /def:".\libapr.def" /out:"$(OUTDIR)\libapr.dll" /implib:"$(OUTDIR)\libapr.lib" 
-DEF_FILE= \
-	".\libapr.def"
+ /out:"$(OUTDIR)\libapr.dll" /implib:"$(OUTDIR)\libapr.lib" /OPT:NOREF 
 LINK32_OBJS= \
-	"$(INTDIR)\libapr.obj" \
-	".\LibD\apr.lib"
+	"$(INTDIR)\access.obj" \
+	"$(INTDIR)\apr_cpystrn.obj" \
+	"$(INTDIR)\apr_fnmatch.obj" \
+	"$(INTDIR)\apr_getpass.obj" \
+	"$(INTDIR)\apr_hash.obj" \
+	"$(INTDIR)\apr_md5.obj" \
+	"$(INTDIR)\apr_pools.obj" \
+	"$(INTDIR)\apr_signal.obj" \
+	"$(INTDIR)\apr_snprintf.obj" \
+	"$(INTDIR)\apr_strings.obj" \
+	"$(INTDIR)\apr_strnatcmp.obj" \
+	"$(INTDIR)\apr_tables.obj" \
+	"$(INTDIR)\common.obj" \
+	"$(INTDIR)\dir.obj" \
+	"$(INTDIR)\dso.obj" \
+	"$(INTDIR)\errorcodes.obj" \
+	"$(INTDIR)\fileacc.obj" \
+	"$(INTDIR)\filedup.obj" \
+	"$(INTDIR)\filestat.obj" \
+	"$(INTDIR)\flock.obj" \
+	"$(INTDIR)\fullrw.obj" \
+	"$(INTDIR)\getopt.obj" \
+	"$(INTDIR)\getuuid.obj" \
+	"$(INTDIR)\groupinfo.obj" \
+	"$(INTDIR)\inet_ntop.obj" \
+	"$(INTDIR)\locks.obj" \
+	"$(INTDIR)\misc.obj" \
+	"$(INTDIR)\mmap.obj" \
+	"$(INTDIR)\names.obj" \
+	"$(INTDIR)\open.obj" \
+	"$(INTDIR)\pipe.obj" \
+	"$(INTDIR)\poll.obj" \
+	"$(INTDIR)\proc.obj" \
+	"$(INTDIR)\rand.obj" \
+	"$(INTDIR)\readwrite.obj" \
+	"$(INTDIR)\seek.obj" \
+	"$(INTDIR)\sendrecv.obj" \
+	"$(INTDIR)\signals.obj" \
+	"$(INTDIR)\sockaddr.obj" \
+	"$(INTDIR)\sockets.obj" \
+	"$(INTDIR)\sockopt.obj" \
+	"$(INTDIR)\start.obj" \
+	"$(INTDIR)\thread.obj" \
+	"$(INTDIR)\threadpriv.obj" \
+	"$(INTDIR)\time.obj" \
+	"$(INTDIR)\timestr.obj" \
+	"$(INTDIR)\userinfo.obj" \
+	"$(INTDIR)\utf8_ucs2.obj" \
+	"$(INTDIR)\uuid.obj"
 
 "$(OUTDIR)\libapr.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -218,41 +397,1168 @@ LINK32_OBJS= \
 
 
 !IF "$(CFG)" == "libapr - Win32 Release" || "$(CFG)" == "libapr - Win32 Debug"
+SOURCE=.\time\win32\access.c
+DEP_CPP_ACCES=\
+	".\include\apr.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_general.h"\
+	".\include\apr_lib.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_time.h"\
+	".\include\arch\win32\apr_private.h"\
+	".\include\arch\win32\atime.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
 
-!IF  "$(CFG)" == "libapr - Win32 Release"
+"$(INTDIR)\access.obj" : $(SOURCE) $(DEP_CPP_ACCES) "$(INTDIR)"\
+ ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
 
-"apr - Win32 Release" : 
-   cd "."
-   $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Release" 
-   cd "."
 
-"apr - Win32 ReleaseCLEAN" : 
-   cd "."
-   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Release"\
- RECURSE=1 
-   cd "."
+SOURCE=.\time\win32\time.c
+DEP_CPP_TIME_=\
+	".\include\apr.h"\
+	".\include\apr_dso.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
+	".\include\apr_file_io.h"\
+	".\include\apr_general.h"\
+	".\include\apr_lib.h"\
+	".\include\apr_lock.h"\
+	".\include\apr_network_io.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_portable.h"\
+	".\include\apr_thread_proc.h"\
+	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
+	".\include\arch\win32\apr_private.h"\
+	".\include\arch\win32\atime.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
 
-!ELSEIF  "$(CFG)" == "libapr - Win32 Debug"
+"$(INTDIR)\time.obj" : $(SOURCE) $(DEP_CPP_TIME_) "$(INTDIR)" ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
 
-"apr - Win32 Debug" : 
-   cd "."
-   $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Debug" 
-   cd "."
 
-"apr - Win32 DebugCLEAN" : 
-   cd "."
-   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Debug" RECURSE=1\
- 
-   cd "."
+SOURCE=.\time\win32\timestr.c
+DEP_CPP_TIMES=\
+	".\include\apr.h"\
+	".\include\apr_dso.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
+	".\include\apr_file_io.h"\
+	".\include\apr_lock.h"\
+	".\include\apr_network_io.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_portable.h"\
+	".\include\apr_thread_proc.h"\
+	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
+	".\include\arch\win32\apr_private.h"\
+	".\include\arch\win32\atime.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\timestr.obj" : $(SOURCE) $(DEP_CPP_TIMES) "$(INTDIR)"\
+ ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\strings\apr_cpystrn.c
+DEP_CPP_APR_C=\
+	".\include\apr.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_lib.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_strings.h"\
+	".\include\arch\win32\apr_private.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\apr_cpystrn.obj" : $(SOURCE) $(DEP_CPP_APR_C) "$(INTDIR)"\
+ ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\strings\apr_fnmatch.c
+DEP_CPP_APR_F=\
+	".\include\apr.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_fnmatch.h"\
+	".\include\apr_lib.h"\
+	".\include\arch\win32\apr_private.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\apr_fnmatch.obj" : $(SOURCE) $(DEP_CPP_APR_F) "$(INTDIR)"\
+ ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\strings\apr_snprintf.c
+DEP_CPP_APR_S=\
+	".\include\apr.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
+	".\include\apr_file_io.h"\
+	".\include\apr_lib.h"\
+	".\include\apr_network_io.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
+	".\include\arch\win32\apr_private.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\apr_snprintf.obj" : $(SOURCE) $(DEP_CPP_APR_S) "$(INTDIR)"\
+ ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\strings\apr_strings.c
+DEP_CPP_APR_ST=\
+	".\include\apr.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_lib.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_strings.h"\
+	".\include\arch\win32\apr_private.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\apr_strings.obj" : $(SOURCE) $(DEP_CPP_APR_ST) "$(INTDIR)"\
+ ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\strings\apr_strnatcmp.c
+DEP_CPP_APR_STR=\
+	".\include\apr.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_lib.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_strings.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\apr_strnatcmp.obj" : $(SOURCE) $(DEP_CPP_APR_STR) "$(INTDIR)"\
+ ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\passwd\apr_getpass.c
+DEP_CPP_APR_G=\
+	".\include\apr.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_lib.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_strings.h"\
+	".\include\arch\win32\apr_private.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\apr_getpass.obj" : $(SOURCE) $(DEP_CPP_APR_G) "$(INTDIR)"\
+ ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\passwd\apr_md5.c
+DEP_CPP_APR_M=\
+	".\include\apr.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_lib.h"\
+	".\include\apr_md5.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_strings.h"\
+	".\include\apr_xlate.h"\
+	".\include\arch\win32\apr_private.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\apr_md5.obj" : $(SOURCE) $(DEP_CPP_APR_M) "$(INTDIR)"\
+ ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\tables\apr_hash.c
+DEP_CPP_APR_H=\
+	".\include\apr.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_general.h"\
+	".\include\apr_hash.h"\
+	".\include\apr_pools.h"\
+	".\include\arch\win32\apr_private.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\apr_hash.obj" : $(SOURCE) $(DEP_CPP_APR_H) "$(INTDIR)"\
+ ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\tables\apr_tables.c
+DEP_CPP_APR_T=\
+	".\include\apr.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_general.h"\
+	".\include\apr_lib.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_strings.h"\
+	".\include\apr_tables.h"\
+	".\include\arch\win32\apr_private.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\apr_tables.obj" : $(SOURCE) $(DEP_CPP_APR_T) "$(INTDIR)"\
+ ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\misc\unix\errorcodes.c
+DEP_CPP_ERROR=\
+	".\include\apr.h"\
+	".\include\apr_dso.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
+	".\include\apr_file_io.h"\
+	".\include\apr_general.h"\
+	".\include\apr_getopt.h"\
+	".\include\apr_lib.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_strings.h"\
+	".\include\apr_thread_proc.h"\
+	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
+	".\include\arch\unix\misc.h"\
+	".\include\arch\win32\apr_private.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\errorcodes.obj" : $(SOURCE) $(DEP_CPP_ERROR) "$(INTDIR)"\
+ ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\misc\unix\getopt.c
+DEP_CPP_GETOP=\
+	".\include\apr.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
+	".\include\apr_file_io.h"\
+	".\include\apr_general.h"\
+	".\include\apr_getopt.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_strings.h"\
+	".\include\apr_thread_proc.h"\
+	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
+	".\include\arch\unix\misc.h"\
+	".\include\arch\win32\apr_private.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\getopt.obj" : $(SOURCE) $(DEP_CPP_GETOP) "$(INTDIR)"\
+ ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\misc\win32\getuuid.c
+DEP_CPP_GETUU=\
+	".\include\apr.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_uuid.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\getuuid.obj" : $(SOURCE) $(DEP_CPP_GETUU) "$(INTDIR)"\
+ ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\misc\win32\misc.c
+DEP_CPP_MISC_=\
+	".\include\apr.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
+	".\include\apr_file_io.h"\
+	".\include\apr_general.h"\
+	".\include\apr_getopt.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_thread_proc.h"\
+	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
+	".\include\arch\unix\misc.h"\
+	".\include\arch\win32\apr_private.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\misc.obj" : $(SOURCE) $(DEP_CPP_MISC_) "$(INTDIR)" ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\misc\win32\names.c
+DEP_CPP_NAMES=\
+	".\include\apr.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
+	".\include\apr_file_io.h"\
+	".\include\apr_general.h"\
+	".\include\apr_lib.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_strings.h"\
+	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
+	".\include\arch\win32\apr_private.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\names.obj" : $(SOURCE) $(DEP_CPP_NAMES) "$(INTDIR)"\
+ ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\misc\win32\rand.c
+DEP_CPP_RAND_=\
+	".\include\apr.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_general.h"\
+	".\include\apr_pools.h"\
+	".\include\arch\win32\apr_private.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\rand.obj" : $(SOURCE) $(DEP_CPP_RAND_) "$(INTDIR)" ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\misc\unix\start.c
+DEP_CPP_START=\
+	".\include\apr.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
+	".\include\apr_file_io.h"\
+	".\include\apr_general.h"\
+	".\include\apr_getopt.h"\
+	".\include\apr_lock.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_thread_proc.h"\
+	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
+	".\include\arch\unix\misc.h"\
+	".\include\arch\win32\apr_private.h"\
+	".\include\arch\win32\locks.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\start.obj" : $(SOURCE) $(DEP_CPP_START) "$(INTDIR)"\
+ ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
 
-!ENDIF 
 
-SOURCE=.\misc\win32\libapr.c
+SOURCE=.\misc\unix\uuid.c
+DEP_CPP_UUID_=\
+	".\include\apr.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_lib.h"\
+	".\include\apr_uuid.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\uuid.obj" : $(SOURCE) $(DEP_CPP_UUID_) "$(INTDIR)" ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\file_io\win32\canonfile.c
+SOURCE=.\file_io\win32\dir.c
+DEP_CPP_DIR_C=\
+	".\include\apr.h"\
+	".\include\apr_dso.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
+	".\include\apr_file_io.h"\
+	".\include\apr_general.h"\
+	".\include\apr_getopt.h"\
+	".\include\apr_lock.h"\
+	".\include\apr_network_io.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_portable.h"\
+	".\include\apr_strings.h"\
+	".\include\apr_tables.h"\
+	".\include\apr_thread_proc.h"\
+	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
+	".\include\apr_xlate.h"\
+	".\include\arch\unix\i18n.h"\
+	".\include\arch\unix\misc.h"\
+	".\include\arch\win32\apr_private.h"\
+	".\include\arch\win32\atime.h"\
+	".\include\arch\win32\fileio.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\dir.obj" : $(SOURCE) $(DEP_CPP_DIR_C) "$(INTDIR)" ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\file_io\unix\fileacc.c
+DEP_CPP_FILEA=\
+	".\include\apr.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
+	".\include\apr_file_io.h"\
+	".\include\apr_general.h"\
+	".\include\apr_getopt.h"\
+	".\include\apr_lock.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_strings.h"\
+	".\include\apr_tables.h"\
+	".\include\apr_thread_proc.h"\
+	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
+	".\include\apr_xlate.h"\
+	".\include\arch\unix\i18n.h"\
+	".\include\arch\unix\misc.h"\
+	".\include\arch\win32\apr_private.h"\
+	".\include\arch\win32\fileio.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\fileacc.obj" : $(SOURCE) $(DEP_CPP_FILEA) "$(INTDIR)"\
+ ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\file_io\win32\filedup.c
+DEP_CPP_FILED=\
+	".\include\apr.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
+	".\include\apr_file_io.h"\
+	".\include\apr_general.h"\
+	".\include\apr_getopt.h"\
+	".\include\apr_lock.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_strings.h"\
+	".\include\apr_tables.h"\
+	".\include\apr_thread_proc.h"\
+	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
+	".\include\apr_xlate.h"\
+	".\include\arch\unix\i18n.h"\
+	".\include\arch\unix\misc.h"\
+	".\include\arch\win32\apr_private.h"\
+	".\include\arch\win32\fileio.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
 
-"$(INTDIR)\libapr.obj" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\filedup.obj" : $(SOURCE) $(DEP_CPP_FILED) "$(INTDIR)"\
+ ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+SOURCE=.\file_io\win32\filestat.c
+DEP_CPP_FILES=\
+	".\include\apr.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
+	".\include\apr_file_io.h"\
+	".\include\apr_general.h"\
+	".\include\apr_getopt.h"\
+	".\include\apr_lock.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_strings.h"\
+	".\include\apr_tables.h"\
+	".\include\apr_thread_proc.h"\
+	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
+	".\include\apr_xlate.h"\
+	".\include\arch\unix\i18n.h"\
+	".\include\arch\unix\misc.h"\
+	".\include\arch\win32\apr_private.h"\
+	".\include\arch\win32\atime.h"\
+	".\include\arch\win32\fileio.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\filestat.obj" : $(SOURCE) $(DEP_CPP_FILES) "$(INTDIR)"\
+ ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\file_io\win32\flock.c
+DEP_CPP_FLOCK=\
+	".\include\apr.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
+	".\include\apr_file_io.h"\
+	".\include\apr_general.h"\
+	".\include\apr_getopt.h"\
+	".\include\apr_lock.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_tables.h"\
+	".\include\apr_thread_proc.h"\
+	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
+	".\include\apr_xlate.h"\
+	".\include\arch\unix\i18n.h"\
+	".\include\arch\unix\misc.h"\
+	".\include\arch\win32\apr_private.h"\
+	".\include\arch\win32\fileio.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\flock.obj" : $(SOURCE) $(DEP_CPP_FLOCK) "$(INTDIR)"\
+ ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\file_io\unix\fullrw.c
+DEP_CPP_FULLR=\
+	".\include\apr.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
+	".\include\apr_file_io.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\fullrw.obj" : $(SOURCE) $(DEP_CPP_FULLR) "$(INTDIR)"\
+ ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\file_io\win32\open.c
+DEP_CPP_OPEN_=\
+	".\include\apr.h"\
+	".\include\apr_dso.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
+	".\include\apr_file_io.h"\
+	".\include\apr_general.h"\
+	".\include\apr_getopt.h"\
+	".\include\apr_lock.h"\
+	".\include\apr_network_io.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_portable.h"\
+	".\include\apr_strings.h"\
+	".\include\apr_tables.h"\
+	".\include\apr_thread_proc.h"\
+	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
+	".\include\apr_xlate.h"\
+	".\include\arch\unix\i18n.h"\
+	".\include\arch\unix\misc.h"\
+	".\include\arch\win32\apr_private.h"\
+	".\include\arch\win32\fileio.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\open.obj" : $(SOURCE) $(DEP_CPP_OPEN_) "$(INTDIR)" ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\file_io\win32\pipe.c
+DEP_CPP_PIPE_=\
+	".\include\apr.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
+	".\include\apr_file_io.h"\
+	".\include\apr_general.h"\
+	".\include\apr_getopt.h"\
+	".\include\apr_lock.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_strings.h"\
+	".\include\apr_tables.h"\
+	".\include\apr_thread_proc.h"\
+	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
+	".\include\apr_xlate.h"\
+	".\include\arch\unix\i18n.h"\
+	".\include\arch\unix\misc.h"\
+	".\include\arch\win32\apr_private.h"\
+	".\include\arch\win32\fileio.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\pipe.obj" : $(SOURCE) $(DEP_CPP_PIPE_) "$(INTDIR)" ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\file_io\win32\readwrite.c
+DEP_CPP_READW=\
+	".\include\apr.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
+	".\include\apr_file_io.h"\
+	".\include\apr_general.h"\
+	".\include\apr_getopt.h"\
+	".\include\apr_lib.h"\
+	".\include\apr_lock.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_tables.h"\
+	".\include\apr_thread_proc.h"\
+	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
+	".\include\apr_xlate.h"\
+	".\include\arch\unix\i18n.h"\
+	".\include\arch\unix\misc.h"\
+	".\include\arch\win32\apr_private.h"\
+	".\include\arch\win32\atime.h"\
+	".\include\arch\win32\fileio.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\readwrite.obj" : $(SOURCE) $(DEP_CPP_READW) "$(INTDIR)"\
+ ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\file_io\win32\seek.c
+DEP_CPP_SEEK_=\
+	".\include\apr.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
+	".\include\apr_file_io.h"\
+	".\include\apr_general.h"\
+	".\include\apr_getopt.h"\
+	".\include\apr_lock.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_tables.h"\
+	".\include\apr_thread_proc.h"\
+	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
+	".\include\apr_xlate.h"\
+	".\include\arch\unix\i18n.h"\
+	".\include\arch\unix\misc.h"\
+	".\include\arch\win32\apr_private.h"\
+	".\include\arch\win32\fileio.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\seek.obj" : $(SOURCE) $(DEP_CPP_SEEK_) "$(INTDIR)" ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\locks\win32\locks.c
+DEP_CPP_LOCKS=\
+	".\include\apr.h"\
+	".\include\apr_dso.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
+	".\include\apr_file_io.h"\
+	".\include\apr_general.h"\
+	".\include\apr_lock.h"\
+	".\include\apr_network_io.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_portable.h"\
+	".\include\apr_strings.h"\
+	".\include\apr_thread_proc.h"\
+	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
+	".\include\arch\win32\locks.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\locks.obj" : $(SOURCE) $(DEP_CPP_LOCKS) "$(INTDIR)"\
+ ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\network_io\unix\inet_ntop.c
+DEP_CPP_INET_=\
+	".\include\apr.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
+	".\include\apr_file_io.h"\
+	".\include\apr_general.h"\
+	".\include\apr_network_io.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
+	".\include\arch\win32\apr_private.h"\
+	".\include\arch\win32\networkio.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\inet_ntop.obj" : $(SOURCE) $(DEP_CPP_INET_) "$(INTDIR)"\
+ ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\network_io\win32\poll.c
+DEP_CPP_POLL_=\
+	".\include\apr.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
+	".\include\apr_file_io.h"\
+	".\include\apr_general.h"\
+	".\include\apr_lib.h"\
+	".\include\apr_network_io.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
+	".\include\arch\win32\networkio.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\poll.obj" : $(SOURCE) $(DEP_CPP_POLL_) "$(INTDIR)" ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\network_io\unix\sa_common.c
+SOURCE=.\network_io\win32\sendrecv.c
+DEP_CPP_SENDR=\
+	".\include\apr.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
+	".\include\apr_file_io.h"\
+	".\include\apr_general.h"\
+	".\include\apr_getopt.h"\
+	".\include\apr_lib.h"\
+	".\include\apr_lock.h"\
+	".\include\apr_network_io.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_tables.h"\
+	".\include\apr_thread_proc.h"\
+	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
+	".\include\apr_xlate.h"\
+	".\include\arch\unix\i18n.h"\
+	".\include\arch\unix\misc.h"\
+	".\include\arch\win32\apr_private.h"\
+	".\include\arch\win32\fileio.h"\
+	".\include\arch\win32\networkio.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\sendrecv.obj" : $(SOURCE) $(DEP_CPP_SENDR) "$(INTDIR)"\
+ ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\network_io\win32\sockaddr.c
+DEP_CPP_SOCKA=\
+	".\include\apr.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
+	".\include\apr_file_io.h"\
+	".\include\apr_general.h"\
+	".\include\apr_lib.h"\
+	".\include\apr_network_io.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_strings.h"\
+	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
+	".\include\arch\win32\networkio.h"\
+	".\network_io\os2\os2nerrno.h"\
+	".\network_io\unix\sa_common.c"\
+	
+
+"$(INTDIR)\sockaddr.obj" : $(SOURCE) $(DEP_CPP_SOCKA) "$(INTDIR)"\
+ ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\network_io\win32\sockets.c
+DEP_CPP_SOCKE=\
+	".\include\apr.h"\
+	".\include\apr_dso.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
+	".\include\apr_file_io.h"\
+	".\include\apr_general.h"\
+	".\include\apr_lib.h"\
+	".\include\apr_lock.h"\
+	".\include\apr_network_io.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_portable.h"\
+	".\include\apr_thread_proc.h"\
+	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
+	".\include\arch\win32\networkio.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\sockets.obj" : $(SOURCE) $(DEP_CPP_SOCKE) "$(INTDIR)"\
+ ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\network_io\win32\sockopt.c
+DEP_CPP_SOCKO=\
+	".\include\apr.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
+	".\include\apr_file_io.h"\
+	".\include\apr_general.h"\
+	".\include\apr_network_io.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_strings.h"\
+	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
+	".\include\arch\win32\networkio.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\sockopt.obj" : $(SOURCE) $(DEP_CPP_SOCKO) "$(INTDIR)"\
+ ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\threadproc\win32\proc.c
+DEP_CPP_PROC_=\
+	".\include\apr.h"\
+	".\include\apr_dso.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
+	".\include\apr_file_io.h"\
+	".\include\apr_general.h"\
+	".\include\apr_getopt.h"\
+	".\include\apr_lock.h"\
+	".\include\apr_network_io.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_portable.h"\
+	".\include\apr_strings.h"\
+	".\include\apr_tables.h"\
+	".\include\apr_thread_proc.h"\
+	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
+	".\include\apr_xlate.h"\
+	".\include\arch\unix\i18n.h"\
+	".\include\arch\unix\misc.h"\
+	".\include\arch\win32\apr_private.h"\
+	".\include\arch\win32\fileio.h"\
+	".\include\arch\win32\threadproc.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\proc.obj" : $(SOURCE) $(DEP_CPP_PROC_) "$(INTDIR)" ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\threadproc\win32\signals.c
+DEP_CPP_SIGNA=\
+	".\include\apr.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
+	".\include\apr_file_io.h"\
+	".\include\apr_general.h"\
+	".\include\apr_getopt.h"\
+	".\include\apr_lock.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_tables.h"\
+	".\include\apr_thread_proc.h"\
+	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
+	".\include\apr_xlate.h"\
+	".\include\arch\unix\i18n.h"\
+	".\include\arch\unix\misc.h"\
+	".\include\arch\win32\apr_private.h"\
+	".\include\arch\win32\fileio.h"\
+	".\include\arch\win32\threadproc.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\signals.obj" : $(SOURCE) $(DEP_CPP_SIGNA) "$(INTDIR)"\
+ ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\threadproc\win32\thread.c
+DEP_CPP_THREA=\
+	".\include\apr.h"\
+	".\include\apr_dso.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
+	".\include\apr_file_io.h"\
+	".\include\apr_general.h"\
+	".\include\apr_lib.h"\
+	".\include\apr_lock.h"\
+	".\include\apr_network_io.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_portable.h"\
+	".\include\apr_thread_proc.h"\
+	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
+	".\include\arch\win32\apr_private.h"\
+	".\include\arch\win32\threadproc.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\thread.obj" : $(SOURCE) $(DEP_CPP_THREA) "$(INTDIR)"\
+ ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\threadproc\win32\threadpriv.c
+DEP_CPP_THREAD=\
+	".\include\apr.h"\
+	".\include\apr_dso.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
+	".\include\apr_file_io.h"\
+	".\include\apr_general.h"\
+	".\include\apr_lib.h"\
+	".\include\apr_lock.h"\
+	".\include\apr_network_io.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_portable.h"\
+	".\include\apr_thread_proc.h"\
+	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
+	".\include\arch\win32\apr_private.h"\
+	".\include\arch\win32\threadproc.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\threadpriv.obj" : $(SOURCE) $(DEP_CPP_THREAD) "$(INTDIR)"\
+ ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\dso\win32\dso.c
+DEP_CPP_DSO_C=\
+	".\include\apr.h"\
+	".\include\apr_dso.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
+	".\include\apr_file_io.h"\
+	".\include\apr_general.h"\
+	".\include\apr_getopt.h"\
+	".\include\apr_lock.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_strings.h"\
+	".\include\apr_tables.h"\
+	".\include\apr_thread_proc.h"\
+	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
+	".\include\apr_xlate.h"\
+	".\include\arch\unix\i18n.h"\
+	".\include\arch\unix\misc.h"\
+	".\include\arch\win32\apr_private.h"\
+	".\include\arch\win32\dso.h"\
+	".\include\arch\win32\fileio.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\dso.obj" : $(SOURCE) $(DEP_CPP_DSO_C) "$(INTDIR)" ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\lib\apr_pools.c
+DEP_CPP_APR_P=\
+	".\include\apr.h"\
+	".\include\apr_dso.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
+	".\include\apr_file_io.h"\
+	".\include\apr_general.h"\
+	".\include\apr_hash.h"\
+	".\include\apr_lib.h"\
+	".\include\apr_lock.h"\
+	".\include\apr_network_io.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_portable.h"\
+	".\include\apr_strings.h"\
+	".\include\apr_thread_proc.h"\
+	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
+	".\include\arch\win32\apr_private.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\apr_pools.obj" : $(SOURCE) $(DEP_CPP_APR_P) "$(INTDIR)"\
+ ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\lib\apr_signal.c
+DEP_CPP_APR_SI=\
+	".\include\apr.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_lib.h"\
+	".\include\arch\win32\apr_private.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\apr_signal.obj" : $(SOURCE) $(DEP_CPP_APR_SI) "$(INTDIR)"\
+ ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\i18n\unix\utf8_ucs2.c
+DEP_CPP_UTF8_=\
+	".\include\apr.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_xlate.h"\
+	".\include\arch\unix\i18n.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\utf8_ucs2.obj" : $(SOURCE) $(DEP_CPP_UTF8_) "$(INTDIR)"\
+ ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\i18n\unix\xlate.c
+SOURCE=.\shmem\win32\shmem.c
+SOURCE=.\mmap\unix\common.c
+DEP_CPP_COMMO=\
+	".\include\apr.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
+	".\include\apr_file_io.h"\
+	".\include\apr_mmap.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
+	".\include\arch\win32\apr_private.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\common.obj" : $(SOURCE) $(DEP_CPP_COMMO) "$(INTDIR)"\
+ ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\mmap\win32\mmap.c
+DEP_CPP_MMAP_=\
+	".\include\apr.h"\
+	".\include\apr_dso.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
+	".\include\apr_file_io.h"\
+	".\include\apr_general.h"\
+	".\include\apr_getopt.h"\
+	".\include\apr_lock.h"\
+	".\include\apr_mmap.h"\
+	".\include\apr_network_io.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_portable.h"\
+	".\include\apr_tables.h"\
+	".\include\apr_thread_proc.h"\
+	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
+	".\include\apr_xlate.h"\
+	".\include\arch\unix\i18n.h"\
+	".\include\arch\unix\misc.h"\
+	".\include\arch\win32\apr_private.h"\
+	".\include\arch\win32\fileio.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\mmap.obj" : $(SOURCE) $(DEP_CPP_MMAP_) "$(INTDIR)" ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\user\win32\groupinfo.c
+DEP_CPP_GROUP=\
+	".\include\apr.h"\
+	".\include\apr_dso.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
+	".\include\apr_file_io.h"\
+	".\include\apr_lock.h"\
+	".\include\apr_network_io.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_portable.h"\
+	".\include\apr_strings.h"\
+	".\include\apr_thread_proc.h"\
+	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
+	".\include\arch\win32\apr_private.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\groupinfo.obj" : $(SOURCE) $(DEP_CPP_GROUP) "$(INTDIR)"\
+ ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\user\win32\userinfo.c
+DEP_CPP_USERI=\
+	".\include\apr.h"\
+	".\include\apr_dso.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
+	".\include\apr_file_io.h"\
+	".\include\apr_lock.h"\
+	".\include\apr_network_io.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_portable.h"\
+	".\include\apr_strings.h"\
+	".\include\apr_thread_proc.h"\
+	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
+	".\include\arch\win32\apr_private.h"\
+	".\network_io\os2\os2nerrno.h"\
+	
+
+"$(INTDIR)\userinfo.obj" : $(SOURCE) $(DEP_CPP_USERI) "$(INTDIR)"\
+ ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\include\apr.hw
+
+!IF  "$(CFG)" == "libapr - Win32 Release"
+
+InputPath=.\include\apr.hw
+
+".\include\apr.h"	 : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy .\include\apr.hw .\include\apr.h > nul 
+	echo Created apr.h from apr.hw 
+	
+
+!ELSEIF  "$(CFG)" == "libapr - Win32 Debug"
+
+InputPath=.\include\apr.hw
+
+".\include\apr.h"	 : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy .\include\apr.hw .\include\apr.h > nul 
+	echo Created apr.h from apr.hw 
+	
+
+!ENDIF 
+
 
 !ENDIF 
 
diff --git a/locks/os2/locks.c b/locks/os2/locks.c
index d5a4a2add..45f769db1 100644
--- a/locks/os2/locks.c
+++ b/locks/os2/locks.c
@@ -58,8 +58,6 @@
 #include "locks.h"
 #include "fileio.h"
 #include <string.h>
-#define INCL_DOS
-#include <os2.h>
 
 #define CurrentTid (lock->tib->tib_ptib2->tib2_ultid)
 
diff --git a/misc/unix/errorcodes.c b/misc/unix/errorcodes.c
index cfa879f43..36bdcb5b1 100644
--- a/misc/unix/errorcodes.c
+++ b/misc/unix/errorcodes.c
@@ -160,8 +160,6 @@ static char *apr_error_string(apr_status_t statcode)
 
 
 #ifdef OS2
-#define INCL_DOS
-#include <os2.h>
 #include <ctype.h>
 
 int apr_canonical_error(apr_status_t err);
diff --git a/network_io/os2/os2calls.c b/network_io/os2/os2calls.c
index 586ab0a8e..1acbfa06f 100644
--- a/network_io/os2/os2calls.c
+++ b/network_io/os2/os2calls.c
@@ -57,8 +57,6 @@
 #include "apr_portable.h"
 #include "apr_general.h"
 #include "apr_lib.h"
-#define INCL_DOS
-#include <os2.h>
 
 static int os2_socket_init(int, int ,int);
 
diff --git a/network_io/os2/os2calls.h b/network_io/os2/os2calls.h
deleted file mode 100644
index 8a8b83bd0..000000000
--- a/network_io/os2/os2calls.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2000 The Apache Software Foundation.  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. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" 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. Products derived from this software may not be called "Apache",
- *    nor may "Apache" appear in their name, without prior written
- *    permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``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 SOFTWARE FOUNDATION 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 Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include "os2nerrno.h"
-
-extern int (*apr_os2_socket)(int, int, int);
-extern int (*apr_os2_select)(int *, int, int, int, long);
-extern int (*apr_os2_sock_errno)();
-extern int (*apr_os2_accept)(int, struct sockaddr *, int *);
-extern int (*apr_os2_bind)(int, struct sockaddr *, int);
-extern int (*apr_os2_connect)(int, struct sockaddr *, int);
-extern int (*apr_os2_getpeername)(int, struct sockaddr *, int *);
-extern int (*apr_os2_getsockname)(int, struct sockaddr *, int *);
-extern int (*apr_os2_getsockopt)(int, int, int, char *, int *);
-extern int (*apr_os2_ioctl)(int, int, caddr_t, int);
-extern int (*apr_os2_listen)(int, int);
-extern int (*apr_os2_recv)(int, char *, int, int);
-extern int (*apr_os2_send)(int, const char *, int, int);
-extern int (*apr_os2_setsockopt)(int, int, int, char *, int);
-extern int (*apr_os2_shutdown)(int, int);
-extern int (*apr_os2_soclose)(int);
-extern int (*apr_os2_writev)(int, struct iovec *, int);
-
-#define socket apr_os2_socket
-#define select apr_os2_select
-#define sock_errno apr_os2_sock_errno
-#define accept apr_os2_accept
-#define bind apr_os2_bind
-#define connect apr_os2_connect
-#define getpeername apr_os2_getpeername
-#define getsockname apr_os2_getsockname
-#define getsockopt apr_os2_getsockopt
-#define ioctl apr_os2_ioctl
-#define listen apr_os2_listen
-#define recv apr_os2_recv
-#define send apr_os2_send
-#define setsockopt apr_os2_setsockopt
-#define shutdown apr_os2_shutdown
-#define soclose apr_os2_soclose
-#define writev apr_os2_writev
diff --git a/network_io/os2/os2nerrno.h b/network_io/os2/os2nerrno.h
deleted file mode 100644
index 0d6b444e2..000000000
--- a/network_io/os2/os2nerrno.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef __OS2NERRNO_H
-#define __OS2NERRNO_H
-
-/* Error codes returned by above calls */
-#define SOCBASEERR              10000
-
-#define SOCEPERM                (SOCBASEERR+1)             /* Not owner */
-#define SOCESRCH                (SOCBASEERR+3)             /* No such process */
-#define SOCEINTR                (SOCBASEERR+4)             /* Interrupted system call */
-#define SOCENXIO                (SOCBASEERR+6)             /* No such device or address */
-#define SOCEBADF                (SOCBASEERR+9)             /* Bad file number */
-#define SOCEACCES               (SOCBASEERR+13)            /* Permission denied */
-#define SOCEFAULT               (SOCBASEERR+14)            /* Bad address */
-#define SOCEINVAL               (SOCBASEERR+22)            /* Invalid argument */
-#define SOCEMFILE               (SOCBASEERR+24)            /* Too many open files */
-#define SOCEPIPE                (SOCBASEERR+32)            /* Broken pipe */
-#define SOCEOS2ERR              (SOCBASEERR+100)           /* OS/2 Error */
-#define SOCEWOULDBLOCK          (SOCBASEERR+35)            /* Operation would block */
-#define SOCEINPROGRESS          (SOCBASEERR+36)            /* Operation now in progress */
-#define SOCEALREADY             (SOCBASEERR+37)            /* Operation already in progress */
-#define SOCENOTSOCK             (SOCBASEERR+38)            /* Socket operation on non-socket */
-#define SOCEDESTADDRREQ         (SOCBASEERR+39)            /* Destination address required */
-#define SOCEMSGSIZE             (SOCBASEERR+40)            /* Message too long */
-#define SOCEPROTOTYPE           (SOCBASEERR+41)            /* Protocol wrong type for socket */
-#define SOCENOPROTOOPT          (SOCBASEERR+42)            /* Protocol not available */
-#define SOCEPROTONOSUPPORT      (SOCBASEERR+43)            /* Protocol not supported */
-#define SOCESOCKTNOSUPPORT      (SOCBASEERR+44)            /* Socket type not supported */
-#define SOCEOPNOTSUPP           (SOCBASEERR+45)            /* Operation not supported on socket */
-#define SOCEPFNOSUPPORT         (SOCBASEERR+46)            /* Protocol family not supported */
-#define SOCEAFNOSUPPORT         (SOCBASEERR+47)            /* Address family not supported by protocol family */
-#define SOCEADDRINUSE           (SOCBASEERR+48)            /* Address already in use */
-#define SOCEADDRNOTAVAIL        (SOCBASEERR+49)            /* Can't assign requested address */
-#define SOCENETDOWN             (SOCBASEERR+50)            /* Network is down */
-#define SOCENETUNREACH          (SOCBASEERR+51)            /* Network is unreachable */
-#define SOCENETRESET            (SOCBASEERR+52)            /* Network dropped connection on reset */
-#define SOCECONNABORTED         (SOCBASEERR+53)            /* Software caused connection abort */
-#define SOCECONNRESET           (SOCBASEERR+54)            /* Connection reset by peer */
-#define SOCENOBUFS              (SOCBASEERR+55)            /* No buffer space available */
-#define SOCEISCONN              (SOCBASEERR+56)            /* Socket is already connected */
-#define SOCENOTCONN             (SOCBASEERR+57)            /* Socket is not connected */
-#define SOCESHUTDOWN            (SOCBASEERR+58)            /* Can't send after socket shutdown */
-#define SOCETOOMANYREFS         (SOCBASEERR+59)            /* Too many references: can't splice */
-#define SOCETIMEDOUT            (SOCBASEERR+60)            /* Connection timed out */
-#define SOCECONNREFUSED         (SOCBASEERR+61)            /* Connection refused */
-#define SOCELOOP                (SOCBASEERR+62)            /* Too many levels of symbolic links */
-#define SOCENAMETOOLONG         (SOCBASEERR+63)            /* File name too long */
-#define SOCEHOSTDOWN            (SOCBASEERR+64)            /* Host is down */
-#define SOCEHOSTUNREACH         (SOCBASEERR+65)            /* No route to host */
-#define SOCENOTEMPTY            (SOCBASEERR+66)            /* Directory not empty */
-
-#endif
diff --git a/network_io/os2/poll.c b/network_io/os2/poll.c
index ad96e1aa0..9fe63222d 100644
--- a/network_io/os2/poll.c
+++ b/network_io/os2/poll.c
@@ -59,8 +59,6 @@
 #include "apr_lib.h"
 #include <sys/time.h>
 #include <stdlib.h>
-#define INCL_DOS
-#include <os2.h>
 
 /*  OS/2 doesn't have a poll function, implement using OS/2 style select */
  
diff --git a/shmem/os2/shmem.c b/shmem/os2/shmem.c
index 970062998..6e4dcbebf 100644
--- a/shmem/os2/shmem.c
+++ b/shmem/os2/shmem.c
@@ -59,8 +59,6 @@
 #include "apr_strings.h"
 #include <umalloc.h>
 #include <stdlib.h>
-#define INCL_DOS
-#include <os2.h>
 
 struct shmem_t {
     void *memblock;
diff --git a/test/aprtest.dsp b/test/aprtest.dsp
index f562131f7..8d40f8b2d 100644
--- a/test/aprtest.dsp
+++ b/test/aprtest.dsp
@@ -1,5 +1,5 @@
 # Microsoft Developer Studio Project File - Name="aprtest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# Microsoft Developer Studio Generated Build File, Format Version 5.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) External Target" 0x0106
@@ -22,7 +22,6 @@ CFG=aprtest - Win32 Debug
 !MESSAGE 
 
 # Begin Project
-# PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
 
diff --git a/threadproc/os2/proc.c b/threadproc/os2/proc.c
index 8bc3fec50..9231c6686 100644
--- a/threadproc/os2/proc.c
+++ b/threadproc/os2/proc.c
@@ -70,7 +70,6 @@
 #include <unistd.h>
 #include <process.h>
 #include <stdlib.h>
-#include <os2.h>
 
 apr_status_t apr_createprocattr_init(apr_procattr_t **new, apr_pool_t *cont)
 {
diff --git a/threadproc/os2/signals.c b/threadproc/os2/signals.c
index 6efd71d18..56170f401 100644
--- a/threadproc/os2/signals.c
+++ b/threadproc/os2/signals.c
@@ -61,8 +61,6 @@
 #include <signal.h>
 #include <string.h>
 #include <sys/wait.h>
-#define INCL_DOS
-#include <os2.h>
 
 apr_status_t apr_kill(apr_proc_t *proc, int signal)
 {
diff --git a/threadproc/os2/thread.c b/threadproc/os2/thread.c
index 3879f6d80..a99eb5968 100644
--- a/threadproc/os2/thread.c
+++ b/threadproc/os2/thread.c
@@ -60,7 +60,6 @@
 #include "apr_lib.h"
 #include "fileio.h"
 #include <stdlib.h>
-#include <os2.h>
 
 apr_status_t apr_create_threadattr(apr_threadattr_t **new, apr_pool_t *cont)
 {
diff --git a/time/unix/time.c b/time/unix/time.c
index 96b5d6644..7eb421970 100644
--- a/time/unix/time.c
+++ b/time/unix/time.c
@@ -66,10 +66,6 @@
 #if HAVE_TIME_H
 #include <time.h>
 #endif
-#ifdef OS2
-#define INCL_DOS
-#include <os2.h>
-#endif
 #ifdef BEOS
 #include <sys/socket.h> /* for select */
 #endif
author	wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68>	2001-01-28 15:30:32 +0000
committer	wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68>	2001-01-28 15:30:32 +0000
commit	59390e54e5b10995256cdea6e687a78f5d3cd4c8 (patch)
tree	843434e4345725b973f90ace72dc1325b5fc3719
parent	d03b24c71bc3568f1e50c062eabd19edf3ad0f9c (diff)
download	libapr-59390e54e5b10995256cdea6e687a78f5d3cd4c8.tar.gz