Return-Path: Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm Delivered-To: mailing list cvs@apr.apache.org Received: (qmail 41177 invoked by uid 1134); 28 Jan 2001 15:30:32 -0000 Date: 28 Jan 2001 15:30:32 -0000 Message-ID: <20010128153032.41176.qmail@apache.org> From: wrowe@apache.org To: apr-cvs@apache.org Subject: cvs commit: apr/time/unix time.c wrowe 01/01/28 07:30:32 Modified: . apr.dsp apr.mak libapr.dsp libapr.mak dso/os2 dso.c file_io/os2 dir.c filedup.c filestat.c maperrorcode.c readwrite.c seek.c include apr.h.in apr_errno.h apr_portable.h include/arch/os2 dso.h fileio.h locks.h os2calls.h locks/os2 locks.c misc/unix errorcodes.c network_io/os2 os2calls.c poll.c shmem/os2 shmem.c test aprtest.dsp threadproc/os2 proc.c signals.c thread.c time/unix time.c Removed: include/arch/os2 os2nerrno.h network_io/os2 os2calls.h os2nerrno.h Log: OS2 was chasing os2errno.h which we hid in a private platform directory, but apr_errno.h is public. It also called in 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 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. Revision Changes Path 1.63 +3 -4 apr/apr.dsp Index: apr.dsp =================================================================== RCS file: /home/cvs/apr/apr.dsp,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- apr.dsp 2001/01/28 01:34:26 1.62 +++ apr.dsp 2001/01/28 15:30:21 1.63 @@ -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 @@ !MESSAGE # Begin Project -# PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe @@ -64,8 +63,8 @@ # 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 1.3 +158 -0 apr/apr.mak Index: apr.mak =================================================================== RCS file: /home/cvs/apr/apr.mak,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- apr.mak 2000/12/21 23:02:35 1.2 +++ apr.mak 2001/01/28 15:30:22 1.3 @@ -68,6 +68,7 @@ -@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 @@ -@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 @@ "$(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 @@ "$(INTDIR)\threadpriv.obj" \ "$(INTDIR)\time.obj" \ "$(INTDIR)\timestr.obj" \ + "$(INTDIR)\userinfo.obj" \ "$(INTDIR)\utf8_ucs2.obj" \ "$(INTDIR)\uuid.obj" @@ -240,6 +244,7 @@ -@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 @@ -@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 @@ "$(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 @@ "$(INTDIR)\threadpriv.obj" \ "$(INTDIR)\time.obj" \ "$(INTDIR)\timestr.obj" \ + "$(INTDIR)\userinfo.obj" \ "$(INTDIR)\utf8_ucs2.obj" \ "$(INTDIR)\uuid.obj" @@ -395,6 +403,7 @@ ".\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 @@ ".\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 @@ ".\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 @@ ".\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 @@ 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 @@ ".\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 @@ ".\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 @@ 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 @@ ".\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 @@ 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 @@ 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 @@ 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 @@ ".\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 @@ ".\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 @@ ".\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 @@ 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 @@ ".\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 @@ 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 @@ ".\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 @@ 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 @@ 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 @@ ".\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 @@ 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 @@ ".\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 @@ ".\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 @@ 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 @@ ".\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 @@ 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 @@ ".\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 @@ 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 @@ ".\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 @@ ".\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 @@ ".\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 @@ 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 @@ 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 @@ 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 @@ ".\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 @@ 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 @@ ".\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 @@ ".\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 @@ ".\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 @@ 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 @@ ".\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 @@ ".\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 @@ 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 @@ ".\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 @@ ".\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 @@ ".\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 @@ ".\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 @@ ".\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 @@ ".\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 @@ ".\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 @@ ".\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 @@ ".\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 @@ 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 @@ ".\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 @@ ".\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"\ @@ -1359,6 +1467,56 @@ "$(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) 1.21 +3 -4 apr/libapr.dsp Index: libapr.dsp =================================================================== RCS file: /home/cvs/apr/libapr.dsp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- libapr.dsp 2001/01/28 01:34:26 1.20 +++ libapr.dsp 2001/01/28 15:30:22 1.21 @@ -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 @@ !MESSAGE # Begin Project -# PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe @@ -68,8 +67,8 @@ # 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" 1.2 +1357 -51 apr/libapr.mak Index: libapr.mak =================================================================== RCS file: /home/cvs/apr/libapr.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libapr.mak 2000/12/21 01:46:20 1.1 +++ libapr.mak 2001/01/28 15:30:22 1.2 @@ -39,17 +39,61 @@ !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_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_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 @@ !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_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_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,40 +397,1167 @@ !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 "." -!ELSEIF "$(CFG)" == "libapr - Win32 Debug" +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"\ + -"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 "." +"$(INTDIR)\time.obj" : $(SOURCE) $(DEP_CPP_TIME_) "$(INTDIR)" ".\include\apr.h" + $(CPP) $(CPP_PROJ) $(SOURCE) -!ENDIF + +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"\ + -SOURCE=.\misc\win32\libapr.c +"$(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) + + +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)\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)\libapr.obj" : $(SOURCE) "$(INTDIR)" +"$(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 1.19 +0 -2 apr/dso/os2/dso.c Index: dso.c =================================================================== RCS file: /home/cvs/apr/dso/os2/dso.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- dso.c 2001/01/19 09:56:31 1.18 +++ dso.c 2001/01/28 15:30:23 1.19 @@ -54,8 +54,6 @@ #include "dso.h" #include "apr_strings.h" -#define INCL_DOS -#include #include #include 1.24 +0 -3 apr/file_io/os2/dir.c Index: dir.c =================================================================== RCS file: /home/cvs/apr/file_io/os2/dir.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- dir.c 2001/01/25 11:34:53 1.23 +++ dir.c 2001/01/28 15:30:23 1.24 @@ -58,9 +58,6 @@ #include "apr_strings.h" #include -#define INCL_DOS -#include - static apr_status_t dir_cleanup(void *thedir) { apr_dir_t *dir = thedir; 1.19 +0 -3 apr/file_io/os2/filedup.c Index: filedup.c =================================================================== RCS file: /home/cvs/apr/file_io/os2/filedup.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- filedup.c 2000/11/14 06:40:03 1.18 +++ filedup.c 2001/01/28 15:30:23 1.19 @@ -58,9 +58,6 @@ #include "apr_strings.h" #include -#define INCL_DOS -#include - apr_status_t apr_dupfile(apr_file_t **new_file, apr_file_t *old_file, apr_pool_t *p) { int rv; 1.19 +0 -1 apr/file_io/os2/filestat.c Index: filestat.c =================================================================== RCS file: /home/cvs/apr/file_io/os2/filestat.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- filestat.c 2001/01/25 11:34:55 1.18 +++ filestat.c 2001/01/28 15:30:23 1.19 @@ -58,7 +58,6 @@ #include "apr_file_io.h" #include "apr_lib.h" #include -#include static void FS3_to_finfo(apr_finfo_t *finfo, FILESTATUS3 *fstatus) 1.12 +1 -3 apr/file_io/os2/maperrorcode.c Index: maperrorcode.c =================================================================== RCS file: /home/cvs/apr/file_io/os2/maperrorcode.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- maperrorcode.c 2000/11/14 06:40:03 1.11 +++ maperrorcode.c 2001/01/28 15:30:24 1.12 @@ -57,9 +57,7 @@ #include "apr_file_io.h" #include #include -#include -#include "../../network_io/os2/os2calls.h" - +#include "apr_errno.h" static int errormap[][2] = { { NO_ERROR, APR_SUCCESS }, 1.37 +0 -1 apr/file_io/os2/readwrite.c Index: readwrite.c =================================================================== RCS file: /home/cvs/apr/file_io/os2/readwrite.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- readwrite.c 2000/11/14 06:40:03 1.36 +++ readwrite.c 2001/01/28 15:30:24 1.37 @@ -59,7 +59,6 @@ #include "apr_file_io.h" #include "apr_lib.h" -#include #include apr_status_t apr_read(apr_file_t *thefile, void *buf, apr_size_t *nbytes) 1.13 +0 -4 apr/file_io/os2/seek.c Index: seek.c =================================================================== RCS file: /home/cvs/apr/file_io/os2/seek.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- seek.c 2001/01/20 21:39:02 1.12 +++ seek.c 2001/01/28 15:30:24 1.13 @@ -58,10 +58,6 @@ #include #include -#define INCL_DOS -#include - - static apr_status_t setptr(apr_file_t *thefile, unsigned long pos ) { 1.64 +6 -0 apr/include/apr.h.in Index: apr.h.in =================================================================== RCS file: /home/cvs/apr/include/apr.h.in,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- apr.h.in 2001/01/27 22:25:10 1.63 +++ apr.h.in 2001/01/28 15:30:25 1.64 @@ -243,4 +243,10 @@ #endif /* !WEXITSTATUS */ #endif /* HAVE_SYS_WAIT_H */ +#ifdef OS2 +#define INCL_DOS +#define INCL_DOSERRORS +#include +#endif + #endif /* APR_H */ 1.53 +48 -2 apr/include/apr_errno.h Index: apr_errno.h =================================================================== RCS file: /home/cvs/apr/include/apr_errno.h,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- apr_errno.h 2001/01/24 09:44:49 1.52 +++ apr_errno.h 2001/01/28 15:30:25 1.53 @@ -457,14 +457,60 @@ #define INCL_DOSERRORS #define INCL_DOS -#include -#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)) #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 \ 1.43 +0 -2 apr/include/apr_portable.h Index: apr_portable.h =================================================================== RCS file: /home/cvs/apr/include/apr_portable.h,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- apr_portable.h 2001/01/18 20:07:21 1.42 +++ apr_portable.h 2001/01/28 15:30:25 1.43 @@ -103,8 +103,6 @@ typedef SYSTEMTIME apr_os_exp_time_t; #elif defined(OS2) -#define INCL_DOS -#include typedef HFILE apr_os_file_t; typedef HDIR apr_os_dir_t; typedef int apr_os_sock_t; 1.12 +0 -3 apr/include/arch/os2/dso.h Index: dso.h =================================================================== RCS file: /home/cvs/apr/include/arch/os2/dso.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- dso.h 2000/08/02 05:25:42 1.11 +++ dso.h 2001/01/28 15:30:26 1.12 @@ -55,9 +55,6 @@ #ifndef DSO_H #define DSO_H -#define INCL_DOS -#include - #include "apr_private.h" #include "apr_general.h" #include "apr_pools.h" 1.24 +0 -4 apr/include/arch/os2/fileio.h Index: fileio.h =================================================================== RCS file: /home/cvs/apr/include/arch/os2/fileio.h,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- fileio.h 2001/01/23 04:10:47 1.23 +++ fileio.h 2001/01/28 15:30:26 1.24 @@ -55,10 +55,6 @@ #ifndef FILE_IO_H #define FILE_IO_H -#define INCL_DOS -#define INCL_DOSERRORS -#include - #include "apr_private.h" #include "apr_general.h" #include "apr_lock.h" 1.9 +0 -2 apr/include/arch/os2/locks.h Index: locks.h =================================================================== RCS file: /home/cvs/apr/include/arch/os2/locks.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- locks.h 2000/08/02 05:26:20 1.8 +++ locks.h 2001/01/28 15:30:26 1.9 @@ -57,8 +57,6 @@ #include "apr_lock.h" #include "apr_file_io.h" -#define INCL_DOS -#include struct apr_lock_t { apr_pool_t *cntxt; 1.5 +1 -1 apr/include/arch/os2/os2calls.h Index: os2calls.h =================================================================== RCS file: /home/cvs/apr/include/arch/os2/os2calls.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- os2calls.h 2000/10/09 06:46:49 1.4 +++ os2calls.h 2001/01/28 15:30:26 1.5 @@ -52,9 +52,9 @@ * . */ +#include "apr_errno.h" #include #include -#include "os2nerrno.h" extern int (*apr_os2_socket)(int, int, int); extern int (*apr_os2_select)(int *, int, int, int, long); 1.22 +0 -2 apr/locks/os2/locks.c Index: locks.c =================================================================== RCS file: /home/cvs/apr/locks/os2/locks.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- locks.c 2000/11/14 06:40:06 1.21 +++ locks.c 2001/01/28 15:30:27 1.22 @@ -58,8 +58,6 @@ #include "locks.h" #include "fileio.h" #include -#define INCL_DOS -#include #define CurrentTid (lock->tib->tib_ptib2->tib2_ultid) 1.31 +0 -2 apr/misc/unix/errorcodes.c Index: errorcodes.c =================================================================== RCS file: /home/cvs/apr/misc/unix/errorcodes.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- errorcodes.c 2001/01/18 20:07:29 1.30 +++ errorcodes.c 2001/01/28 15:30:28 1.31 @@ -160,8 +160,6 @@ #ifdef OS2 -#define INCL_DOS -#include #include int apr_canonical_error(apr_status_t err); 1.5 +0 -2 apr/network_io/os2/os2calls.c Index: os2calls.c =================================================================== RCS file: /home/cvs/apr/network_io/os2/os2calls.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- os2calls.c 2000/04/08 06:58:41 1.4 +++ os2calls.c 2001/01/28 15:30:28 1.5 @@ -57,8 +57,6 @@ #include "apr_portable.h" #include "apr_general.h" #include "apr_lib.h" -#define INCL_DOS -#include static int os2_socket_init(int, int ,int); 1.19 +0 -2 apr/network_io/os2/poll.c Index: poll.c =================================================================== RCS file: /home/cvs/apr/network_io/os2/poll.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- poll.c 2000/11/13 04:27:50 1.18 +++ poll.c 2001/01/28 15:30:29 1.19 @@ -59,8 +59,6 @@ #include "apr_lib.h" #include #include -#define INCL_DOS -#include /* OS/2 doesn't have a poll function, implement using OS/2 style select */ 1.8 +0 -2 apr/shmem/os2/shmem.c Index: shmem.c =================================================================== RCS file: /home/cvs/apr/shmem/os2/shmem.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- shmem.c 2000/08/06 16:35:55 1.7 +++ shmem.c 2001/01/28 15:30:29 1.8 @@ -59,8 +59,6 @@ #include "apr_strings.h" #include #include -#define INCL_DOS -#include struct shmem_t { void *memblock; 1.5 +1 -2 apr/test/aprtest.dsp Index: aprtest.dsp =================================================================== RCS file: /home/cvs/apr/test/aprtest.dsp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- aprtest.dsp 2000/12/21 01:24:59 1.4 +++ aprtest.dsp 2001/01/28 15:30:30 1.5 @@ -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 @@ !MESSAGE # Begin Project -# PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" 1.36 +0 -1 apr/threadproc/os2/proc.c Index: proc.c =================================================================== RCS file: /home/cvs/apr/threadproc/os2/proc.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- proc.c 2000/11/26 03:43:51 1.35 +++ proc.c 2001/01/28 15:30:31 1.36 @@ -70,7 +70,6 @@ #include #include #include -#include apr_status_t apr_createprocattr_init(apr_procattr_t **new, apr_pool_t *cont) { 1.11 +0 -2 apr/threadproc/os2/signals.c Index: signals.c =================================================================== RCS file: /home/cvs/apr/threadproc/os2/signals.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- signals.c 2000/11/14 06:40:07 1.10 +++ signals.c 2001/01/28 15:30:31 1.11 @@ -61,8 +61,6 @@ #include #include #include -#define INCL_DOS -#include apr_status_t apr_kill(apr_proc_t *proc, int signal) { 1.17 +0 -1 apr/threadproc/os2/thread.c Index: thread.c =================================================================== RCS file: /home/cvs/apr/threadproc/os2/thread.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- thread.c 2000/11/14 06:40:07 1.16 +++ thread.c 2001/01/28 15:30:31 1.17 @@ -60,7 +60,6 @@ #include "apr_lib.h" #include "fileio.h" #include -#include apr_status_t apr_create_threadattr(apr_threadattr_t **new, apr_pool_t *cont) { 1.33 +0 -4 apr/time/unix/time.c Index: time.c =================================================================== RCS file: /home/cvs/apr/time/unix/time.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- time.c 2000/08/06 06:07:32 1.32 +++ time.c 2001/01/28 15:30:32 1.33 @@ -66,10 +66,6 @@ #if HAVE_TIME_H #include #endif -#ifdef OS2 -#define INCL_DOS -#include -#endif #ifdef BEOS #include /* for select */ #endif