wrowe 00/12/07 13:22:43
Modified: . aprutil.def aprutil.dsp
src/dbm apr_dbm.c
Log:
Build apr_dbm(sdbm) and mmap buckets on Win32
Revision Changes Path
1.3 +13 -0 apr-util/aprutil.def
Index: aprutil.def
===================================================================
RCS file: /home/cvs/apr-util/aprutil.def,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- aprutil.def 2000/12/05 19:41:18 1.2
+++ aprutil.def 2000/12/07 21:22:39 1.3
@@ -30,10 +30,12 @@
ap_bucket_create_heap
ap_bucket_create_immortal
ap_bucket_create_pipe
+ap_bucket_create_mmap
ap_file_type
ap_flush_type
ap_pipe_type
ap_eos_type
+ap_mmap_type
ap_brigade_create
ap_brigade_destroy
@@ -48,3 +50,14 @@
ap_hook_sort_register
ap_show_hook
ap_sort_hooks
+
+apr_dbm_open
+apr_dbm_geterror
+apr_dbm_close
+apr_dbm_fetch
+apr_dbm_store
+apr_dbm_delete
+apr_dbm_exists
+apr_dbm_firstkey
+apr_dbm_nextkey
+apr_dbm_freedatum
1.5 +52 -6 apr-util/aprutil.dsp
Index: aprutil.dsp
===================================================================
RCS file: /home/cvs/apr-util/aprutil.dsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- aprutil.dsp 2000/12/06 05:45:21 1.4
+++ aprutil.dsp 2000/12/07 21:22:39 1.5
@@ -69,7 +69,7 @@
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
# ADD BASE CPP /nologo /MTd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "./include" /I "../apr/include" /D
"_DEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "./include" /I "../apr/include" /I
"./dbm/sdbm" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /D
"APU_USE_SDBM" /FD /c
# SUBTRACT CPP /YX
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
@@ -110,7 +110,13 @@
# Begin Source File
SOURCE=.\src\buckets\ap_buckets_mmap.c
-# PROP Exclude_From_Build 1
+
+!IF "$(CFG)" == "aprutil - Win32 Release"
+
+!ELSEIF "$(CFG)" == "aprutil - Win32 Debug"
+
+!ENDIF
+
# End Source File
# Begin Source File
@@ -141,10 +147,6 @@
SOURCE=.\src\crypto\ap_sha1.c
# End Source File
# End Group
-# Begin Group "dbm"
-
-# PROP Default_Filter ""
-# End Group
# Begin Group "encoding"
# PROP Default_Filter ""
@@ -191,6 +193,50 @@
# Begin Source File
SOURCE=.\include\ap_sha1.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_dbm.h
+# End Source File
+# End Group
+# Begin Group "dbm"
+
+# PROP Default_Filter ""
+# Begin Group "sdbm"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\src\dbm\sdbm\sdbm.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\dbm\sdbm\sdbm_hash.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\dbm\sdbm\sdbm_lock.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\dbm\sdbm\sdbm_pair.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\dbm\sdbm\sdbm_pair.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\dbm\sdbm\sdbm_private.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\dbm\sdbm\sdbm_tune.h
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=.\src\dbm\apr_dbm.c
# End Source File
# End Group
# End Target
1.7 +1 -1 apr-util/src/dbm/apr_dbm.c
Index: apr_dbm.c
===================================================================
RCS file: /home/cvs/apr-util/src/dbm/apr_dbm.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- apr_dbm.c 2000/12/06 08:01:10 1.6
+++ apr_dbm.c 2000/12/07 21:22:42 1.7
@@ -56,7 +56,7 @@
#include "apr_errno.h"
#include "apr_pools.h"
-#include "apu_private.h"
+#include "apr_private.h"
#include "apr_dbm.h"
#if APU_USE_SDBM