Added support for bundled flatfile, cdb and cdb_make handlers

to win32 build of the dba extension.

diff --git a/ext/dba/dba.dsp b/ext/dba/dba.dsp
index bcea596d5961358189bb8425729ce03d9b3569b2..7d8e9f7ed2254ae14ea030a77ce884023af58a1a 100644 (file)
--- a/ext/dba/dba.dsp
+++ b/ext/dba/dba.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" /I "..\..\main" /D ZEND_DEBUG=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "PHP_EXPORTS" /D "COMPILE_DL_DBA" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_DBA=1 /D DBA_DB3=1 /D DB3_INCLUDE_FILE="db.h" /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" /I "..\..\main" /D ZEND_DEBUG=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "PHP_EXPORTS" /D "COMPILE_DL_DBA" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_DBA=1 /D DBA_DB3=1 /YX /FD /c\r
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" /I "..\..\main" /D ZEND_DEBUG=0 /D DBA_DB3=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "PHP_EXPORTS" /D "COMPILE_DL_DBA" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_DBA=1 /D DBA_FLATFILE=1 /D DBA_CDB=1 /D DBA_CDB_MAKE=1 /D DBA_CDB_BUILTIN=1 /YX /FD /c\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x407 /d "NDEBUG"\r
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" /I "..\..\main" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "PHP_EXPORTS" /D "COMPILE_DL_DBA" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_DBA=1 /D "DBA_DB3" /D DB3_INCLUDE_FILE="db.h" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" /I "..\..\main" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "PHP_EXPORTS" /D "COMPILE_DL_DBA" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_DBA=1 /D "DBA_DB3" /YX /FD /GZ /c\r
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" /I "..\..\main" /D ZEND_DEBUG=1 /D "DBA_DB3" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "PHP_EXPORTS" /D "COMPILE_DL_DBA" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_DBA=1 /D DBA_FLATFILE=1 /D DBA_CDB=1 /D DBA_CDB_MAKE=1 /D DBA_CDB_BUILTIN=1 /YX /FD /GZ /c\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x407 /d "_DEBUG"\r
@@ -94,6 +94,14 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
 # Begin Source File\r
 \r
+SOURCE=.\libcdb\cdb.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libcdb\cdb_make.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\dba.c\r
 # End Source File\r
 # Begin Source File\r
@@ -114,18 +122,42 @@ SOURCE=.\dba_dbm.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\dba_flatfile.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\dba_gdbm.c\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\dba_ndbm.c\r
 # End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libflatfile\flatfile.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libcdb\uint32.c\r
+# End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r
 \r
 # PROP Default_Filter "h;hpp;hxx;hm;inl"\r
 # Begin Source File\r
 \r
+SOURCE=.\libcdb\cdb.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libcdb\cdb_make.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libflatfile\flatfile.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\php_cdb.h\r
 # End Source File\r
 # Begin Source File\r
@@ -146,12 +178,20 @@ SOURCE=.\php_dbm.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\php_flatfile.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\php_gdbm.h\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\php_ndbm.h\r
 # End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libcdb\uint32.h\r
+# End Source File\r
 # End Group\r
 # End Target\r
 # End Project\r

diff --git a/ext/dba/dba_cdb.c b/ext/dba/dba_cdb.c
index 75192af743f621e97c1887dbb81f7fd22ee50173..e04545e65f0b9560b785362f3a5ac9301fa8c097 100644 (file)
--- a/ext/dba/dba_cdb.c
+++ b/ext/dba/dba_cdb.c
@@ -29,7 +29,9 @@
 #include "php_cdb.h"
 
 #include <sys/types.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <fcntl.h>
 
 #if DBA_CDB_BUILTIN

diff --git a/ext/dba/dba_flatfile.c b/ext/dba/dba_flatfile.c
index 3cecba173d7bd0adf356317b55152ae90e756147..a22866c4560082f63221196230443fa070c8b0bc 100644 (file)
--- a/ext/dba/dba_flatfile.c
+++ b/ext/dba/dba_flatfile.c
@@ -29,7 +29,9 @@
 
 #include "libflatfile/flatfile.h"
 
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>

diff --git a/ext/dba/libcdb/cdb.c b/ext/dba/libcdb/cdb.c
index e712521722b127bc579dc5e5e3468b7c69de5d7f..df0375354a55163045e7d5b9db520afe0c039d06 100644 (file)
--- a/ext/dba/libcdb/cdb.c
+++ b/ext/dba/libcdb/cdb.c
@@ -28,8 +28,12 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
+#ifndef PHP_WIN32
 #include <sys/mman.h>
+#endif
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <string.h>
 #include <errno.h>
 #include "cdb.h"

diff --git a/ext/dba/libcdb/cdb_make.c b/ext/dba/libcdb/cdb_make.c
index 3a7520b274dd42f53a5740cb720f6cea9af715bb..375747f108da172f9aa28c5bfcb31cc916d88f37 100644 (file)
--- a/ext/dba/libcdb/cdb_make.c
+++ b/ext/dba/libcdb/cdb_make.c
@@ -27,7 +27,9 @@
 #include "php.h"
 
 #include <sys/types.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>