edink Wed Nov 13 07:12:45 2002 EDT Modified files: /php4/ext/dba dba.dsp dba_cdb.c dba_flatfile.c /php4/ext/dba/libcdb cdb.c cdb_make.c Log: Added support for bundled flatfile, cdb and cdb_make handlers to win32 build of the dba extension. Index: php4/ext/dba/dba.dsp diff -u php4/ext/dba/dba.dsp:1.2 php4/ext/dba/dba.dsp:1.3 --- php4/ext/dba/dba.dsp:1.2 Thu Oct 26 14:51:12 2000 +++ php4/ext/dba/dba.dsp Wed Nov 13 07:12:44 2002 @@ -44,7 +44,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # 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 -# 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 +# 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 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x407 /d "NDEBUG" @@ -71,7 +71,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # 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 -# 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 +# 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 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x407 /d "_DEBUG" @@ -94,6 +94,14 @@ # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File +SOURCE=.\libcdb\cdb.c +# End Source File +# Begin Source File + +SOURCE=.\libcdb\cdb_make.c +# End Source File +# Begin Source File + SOURCE=.\dba.c # End Source File # Begin Source File @@ -114,18 +122,42 @@ # End Source File # Begin Source File +SOURCE=.\dba_flatfile.c +# End Source File +# Begin Source File + SOURCE=.\dba_gdbm.c # End Source File # Begin Source File SOURCE=.\dba_ndbm.c # End Source File +# Begin Source File + +SOURCE=.\libflatfile\flatfile.c +# End Source File +# Begin Source File + +SOURCE=.\libcdb\uint32.c +# End Source File # End Group # Begin Group "Header Files" # PROP Default_Filter "h;hpp;hxx;hm;inl" # Begin Source File +SOURCE=.\libcdb\cdb.h +# End Source File +# Begin Source File + +SOURCE=.\libcdb\cdb_make.h +# End Source File +# Begin Source File + +SOURCE=.\libflatfile\flatfile.h +# End Source File +# Begin Source File + SOURCE=.\php_cdb.h # End Source File # Begin Source File @@ -146,11 +178,19 @@ # End Source File # Begin Source File +SOURCE=.\php_flatfile.h +# End Source File +# Begin Source File + SOURCE=.\php_gdbm.h # End Source File # Begin Source File SOURCE=.\php_ndbm.h +# End Source File +# Begin Source File + +SOURCE=.\libcdb\uint32.h # End Source File # End Group # End Target Index: php4/ext/dba/dba_cdb.c diff -u php4/ext/dba/dba_cdb.c:1.22 php4/ext/dba/dba_cdb.c:1.23 --- php4/ext/dba/dba_cdb.c:1.22 Sun Nov 10 12:58:46 2002 +++ php4/ext/dba/dba_cdb.c Wed Nov 13 07:12:44 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba_cdb.c,v 1.22 2002/11/10 17:58:46 helly Exp $ */ +/* $Id: dba_cdb.c,v 1.23 2002/11/13 12:12:44 edink Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -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 Index: php4/ext/dba/dba_flatfile.c diff -u php4/ext/dba/dba_flatfile.c:1.7 php4/ext/dba/dba_flatfile.c:1.8 --- php4/ext/dba/dba_flatfile.c:1.7 Sun Nov 10 12:58:46 2002 +++ php4/ext/dba/dba_flatfile.c Wed Nov 13 07:12:44 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba_flatfile.c,v 1.7 2002/11/10 17:58:46 helly Exp $ */ +/* $Id: dba_flatfile.c,v 1.8 2002/11/13 12:12:44 edink Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -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> Index: php4/ext/dba/libcdb/cdb.c diff -u php4/ext/dba/libcdb/cdb.c:1.1 php4/ext/dba/libcdb/cdb.c:1.2 --- php4/ext/dba/libcdb/cdb.c:1.1 Mon Nov 4 12:53:04 2002 +++ php4/ext/dba/libcdb/cdb.c Wed Nov 13 07:12:44 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cdb.c,v 1.1 2002/11/04 17:53:04 helly Exp $ */ +/* $Id: cdb.c,v 1.2 2002/11/13 12:12:44 edink Exp $ */ /* incorporated from D.J.Bernstein's cdb-0.75 (http://cr.yp.to/cdb.html)*/ @@ -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" Index: php4/ext/dba/libcdb/cdb_make.c diff -u php4/ext/dba/libcdb/cdb_make.c:1.1 php4/ext/dba/libcdb/cdb_make.c:1.2 --- php4/ext/dba/libcdb/cdb_make.c:1.1 Mon Nov 4 12:53:04 2002 +++ php4/ext/dba/libcdb/cdb_make.c Wed Nov 13 07:12:44 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cdb_make.c,v 1.1 2002/11/04 17:53:04 helly Exp $ */ +/* $Id: cdb_make.c,v 1.2 2002/11/13 12:12:44 edink Exp $ */ /* incorporated from D.J.Bernstein's cdb-0.75 (http://cr.yp.to/cdb.html)*/ @@ -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>
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php