From: Edin Kadribasic <edink@php.net>
Date: Wed, 13 Nov 2002 12:12:44 +0000 (+0000)
Subject: Added support for bundled flatfile, cdb and cdb_make handlers
X-Git-Tag: php-4.3.0RC1~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=af436aa873439a84f8ba3a73609ff9da6879ea77;p=php

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 bcea596d59..7d8e9f7ed2 100644
--- a/ext/dba/dba.dsp
+++ b/ext/dba/dba.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # 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 @@ LINK32=link.exe
 # 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 @@ LINK32=link.exe
 # 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 @@ SOURCE=.\dba_dbm.c
 # 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,12 +178,20 @@ SOURCE=.\php_dbm.h
 # 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
 # End Project
diff --git a/ext/dba/dba_cdb.c b/ext/dba/dba_cdb.c
index 75192af743..e04545e65f 100644
--- 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 3cecba173d..a22866c456 100644
--- 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 e712521722..df0375354a 100644
--- 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 3a7520b274..375747f108 100644
--- 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>