edink Mon Nov 18 20:07:10 2002 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/dba dba.dsp
/php4/ext/dba/libcdb cdb.c cdb.h cdb_make.c cdb_make.h uint32.c
uint32.h
/php4/ext/dba/libflatfile flatfile.c flatfile.h
Log:
MFH (fix windows build)
Index: php4/ext/dba/dba.dsp
diff -u php4/ext/dba/dba.dsp:1.3 php4/ext/dba/dba.dsp:1.3.2.1
--- php4/ext/dba/dba.dsp:1.3 Wed Nov 13 07:12:44 2002
+++ php4/ext/dba/dba.dsp Mon Nov 18 20:07:09 2002
@@ -43,8 +43,8 @@
# PROP Intermediate_Dir "Release_TS"
# 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 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 CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" /I
+"..\..\main" /D ZEND_DEBUG=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /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 DBA_DB3=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /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"
@@ -70,8 +70,8 @@
# PROP Intermediate_Dir "Debug_TS"
# 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 "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 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
+"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 "DBA_DB3" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /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"
Index: php4/ext/dba/libcdb/cdb.c
diff -u php4/ext/dba/libcdb/cdb.c:1.3 php4/ext/dba/libcdb/cdb.c:1.3.2.1
--- php4/ext/dba/libcdb/cdb.c:1.3 Wed Nov 13 11:30:50 2002
+++ php4/ext/dba/libcdb/cdb.c Mon Nov 18 20:07:09 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: cdb.c,v 1.3 2002/11/13 16:30:50 helly Exp $ */
+/* $Id: cdb.c,v 1.3.2.1 2002/11/19 01:07:09 edink Exp $ */
/* incorporated from D.J.Bernstein's cdb-0.75 (http://cr.yp.to/cdb.html)*/
@@ -73,7 +73,7 @@
/* }}} */
/* {{{ cdb_hash */
-PHPAPI uint32 cdb_hash(char *buf, unsigned int len)
+uint32 cdb_hash(char *buf, unsigned int len)
{
uint32 h;
@@ -87,20 +87,20 @@
/* }}} */
/* {{{ cdb_free */
-PHPAPI void cdb_free(struct cdb *c TSRMLS_DC)
+void cdb_free(struct cdb *c TSRMLS_DC)
{
}
/* }}} */
/* {{{ cdb_findstart */
-PHPAPI void cdb_findstart(struct cdb *c TSRMLS_DC)
+void cdb_findstart(struct cdb *c TSRMLS_DC)
{
c->loop = 0;
}
/* }}} */
/* {{{ cdb_init */
-PHPAPI void cdb_init(struct cdb *c, php_stream *fp TSRMLS_DC)
+void cdb_init(struct cdb *c, php_stream *fp TSRMLS_DC)
{
cdb_free(c TSRMLS_CC);
cdb_findstart(c TSRMLS_CC);
@@ -109,7 +109,7 @@
/* }}} */
/* {{{ cdb_read */
-PHPAPI int cdb_read(struct cdb *c, char *buf, unsigned int len, uint32 pos TSRMLS_DC)
+int cdb_read(struct cdb *c, char *buf, unsigned int len, uint32 pos TSRMLS_DC)
{
if (php_stream_seek(c->fp, pos, SEEK_SET) == -1) {
errno = EPROTO;
@@ -134,7 +134,7 @@
/* }}} */
/* {{{ cdb_findnext */
-PHPAPI int cdb_findnext(struct cdb *c, char *key, unsigned int len TSRMLS_DC)
+int cdb_findnext(struct cdb *c, char *key, unsigned int len TSRMLS_DC)
{
char buf[8];
uint32 pos;
@@ -187,7 +187,7 @@
/* }}} */
/* {{{ cdb_find */
-PHPAPI int cdb_find(struct cdb *c, char *key, unsigned int len TSRMLS_DC)
+int cdb_find(struct cdb *c, char *key, unsigned int len TSRMLS_DC)
{
cdb_findstart(c TSRMLS_CC);
return cdb_findnext(c, key, len TSRMLS_CC);
Index: php4/ext/dba/libcdb/cdb.h
diff -u php4/ext/dba/libcdb/cdb.h:1.1 php4/ext/dba/libcdb/cdb.h:1.1.2.1
--- php4/ext/dba/libcdb/cdb.h:1.1 Mon Nov 4 12:53:04 2002
+++ php4/ext/dba/libcdb/cdb.h Mon Nov 18 20:07:09 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: cdb.h,v 1.1 2002/11/04 17:53:04 helly Exp $ */
+/* $Id: cdb.h,v 1.1.2.1 2002/11/19 01:07:09 edink Exp $ */
/* incorporated from D.J.Bernstein's cdb-0.75 (http://cr.yp.to/cdb.html)*/
@@ -38,16 +38,16 @@
uint32 dlen; /* initialized if cdb_findnext() returns 1 */
};
-PHPAPI uint32 cdb_hash(char *, unsigned int);
+uint32 cdb_hash(char *, unsigned int);
-PHPAPI void cdb_free(struct cdb * TSRMLS_DC);
-PHPAPI void cdb_init(struct cdb *, php_stream *fp TSRMLS_DC);
+void cdb_free(struct cdb * TSRMLS_DC);
+void cdb_init(struct cdb *, php_stream *fp TSRMLS_DC);
-PHPAPI int cdb_read(struct cdb *, char *, unsigned int, uint32 TSRMLS_DC);
+int cdb_read(struct cdb *, char *, unsigned int, uint32 TSRMLS_DC);
-PHPAPI void cdb_findstart(struct cdb * TSRMLS_DC);
-PHPAPI int cdb_findnext(struct cdb *, char *, unsigned int TSRMLS_DC);
-PHPAPI int cdb_find(struct cdb *, char *, unsigned int TSRMLS_DC);
+void cdb_findstart(struct cdb * TSRMLS_DC);
+int cdb_findnext(struct cdb *, char *, unsigned int TSRMLS_DC);
+int cdb_find(struct cdb *, char *, unsigned int TSRMLS_DC);
#define cdb_datapos(c) ((c)->dpos)
#define cdb_datalen(c) ((c)->dlen)
Index: php4/ext/dba/libcdb/cdb_make.c
diff -u php4/ext/dba/libcdb/cdb_make.c:1.2 php4/ext/dba/libcdb/cdb_make.c:1.2.2.1
--- php4/ext/dba/libcdb/cdb_make.c:1.2 Wed Nov 13 07:12:44 2002
+++ php4/ext/dba/libcdb/cdb_make.c Mon Nov 18 20:07:09 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: cdb_make.c,v 1.2 2002/11/13 12:12:44 edink Exp $ */
+/* $Id: cdb_make.c,v 1.2.2.1 2002/11/19 01:07:09 edink Exp $ */
/* incorporated from D.J.Bernstein's cdb-0.75 (http://cr.yp.to/cdb.html)*/
@@ -56,7 +56,7 @@
/* }}} */
/* {{{ cdb_make_start */
-PHPAPI int cdb_make_start(struct cdb_make *c, php_stream * f TSRMLS_DC)
+int cdb_make_start(struct cdb_make *c, php_stream * f TSRMLS_DC)
{
c->head = 0;
c->split = 0;
@@ -73,7 +73,7 @@
/* }}} */
/* {{{ cdb_make_addend */
-PHPAPI int cdb_make_addend(struct cdb_make *c, unsigned int keylen, unsigned int
datalen, uint32 h TSRMLS_DC)
+int cdb_make_addend(struct cdb_make *c, unsigned int keylen, unsigned int datalen,
+uint32 h TSRMLS_DC)
{
struct cdb_hplist *head;
@@ -102,7 +102,7 @@
/* }}} */
/* {{{ cdb_make_addbegin */
-PHPAPI int cdb_make_addbegin(struct cdb_make *c, unsigned int keylen, unsigned int
datalen TSRMLS_DC)
+int cdb_make_addbegin(struct cdb_make *c, unsigned int keylen, unsigned int datalen
+TSRMLS_DC)
{
char buf[8];
@@ -123,7 +123,7 @@
}
/* {{{ cdb_make_add */
-PHPAPI int cdb_make_add(struct cdb_make *c,char *key,unsigned int keylen,char
*data,unsigned int datalen TSRMLS_DC)
+int cdb_make_add(struct cdb_make *c,char *key,unsigned int keylen,char *data,unsigned
+int datalen TSRMLS_DC)
{
if (cdb_make_addbegin(c, keylen, datalen TSRMLS_CC) == -1)
return -1;
@@ -136,7 +136,7 @@
/* }}} */
/* {{{ cdb_make_finish */
-PHPAPI int cdb_make_finish(struct cdb_make *c TSRMLS_DC)
+int cdb_make_finish(struct cdb_make *c TSRMLS_DC)
{
char buf[8];
int i;
Index: php4/ext/dba/libcdb/cdb_make.h
diff -u php4/ext/dba/libcdb/cdb_make.h:1.1 php4/ext/dba/libcdb/cdb_make.h:1.1.2.1
--- php4/ext/dba/libcdb/cdb_make.h:1.1 Mon Nov 4 12:53:04 2002
+++ php4/ext/dba/libcdb/cdb_make.h Mon Nov 18 20:07:09 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: cdb_make.h,v 1.1 2002/11/04 17:53:04 helly Exp $ */
+/* $Id: cdb_make.h,v 1.1.2.1 2002/11/19 01:07:09 edink Exp $ */
/* incorporated from D.J.Bernstein's cdb-0.75 (http://cr.yp.to/cdb.html)*/
@@ -54,10 +54,10 @@
php_stream * fp;
};
-PHPAPI int cdb_make_start(struct cdb_make *, php_stream * TSRMLS_DC);
-PHPAPI int cdb_make_addbegin(struct cdb_make *, unsigned int, unsigned int TSRMLS_DC);
-PHPAPI int cdb_make_addend(struct cdb_make *, unsigned int, unsigned int, uint32
TSRMLS_DC);
-PHPAPI int cdb_make_add(struct cdb_make *, char *, unsigned int, char *, unsigned int
TSRMLS_DC);
-PHPAPI int cdb_make_finish(struct cdb_make * TSRMLS_DC);
+int cdb_make_start(struct cdb_make *, php_stream * TSRMLS_DC);
+int cdb_make_addbegin(struct cdb_make *, unsigned int, unsigned int TSRMLS_DC);
+int cdb_make_addend(struct cdb_make *, unsigned int, unsigned int, uint32 TSRMLS_DC);
+int cdb_make_add(struct cdb_make *, char *, unsigned int, char *, unsigned int
+TSRMLS_DC);
+int cdb_make_finish(struct cdb_make * TSRMLS_DC);
#endif
Index: php4/ext/dba/libcdb/uint32.c
diff -u php4/ext/dba/libcdb/uint32.c:1.1 php4/ext/dba/libcdb/uint32.c:1.1.2.1
--- php4/ext/dba/libcdb/uint32.c:1.1 Mon Nov 4 12:53:04 2002
+++ php4/ext/dba/libcdb/uint32.c Mon Nov 18 20:07:09 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: uint32.c,v 1.1 2002/11/04 17:53:04 helly Exp $ */
+/* $Id: uint32.c,v 1.1.2.1 2002/11/19 01:07:09 edink Exp $ */
/* incorporated from D.J.Bernstein's cdb-0.75 (http://cr.yp.to/cdb.html)*/
@@ -29,7 +29,7 @@
#include "uint32.h"
/* {{{ uint32_pack */
-PHPAPI void uint32_pack(char *out, uint32 in)
+void uint32_pack(char *out, uint32 in)
{
out[0] = in&0xff; in>>=8;
out[1] = in&0xff; in>>=8;
@@ -39,7 +39,7 @@
/* }}} */
/* {{{ uint32_unpack */
-PHPAPI void uint32_unpack(const char *in, uint32 *out)
+void uint32_unpack(const char *in, uint32 *out)
{
*out = (((uint32)(unsigned char)in[3])<<24) |
(((uint32)(unsigned char)in[2])<<16) |
Index: php4/ext/dba/libcdb/uint32.h
diff -u php4/ext/dba/libcdb/uint32.h:1.1 php4/ext/dba/libcdb/uint32.h:1.1.2.1
--- php4/ext/dba/libcdb/uint32.h:1.1 Mon Nov 4 12:53:04 2002
+++ php4/ext/dba/libcdb/uint32.h Mon Nov 18 20:07:09 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: uint32.h,v 1.1 2002/11/04 17:53:04 helly Exp $ */
+/* $Id: uint32.h,v 1.1.2.1 2002/11/19 01:07:09 edink Exp $ */
/* incorporated from D.J.Bernstein's cdb-0.75 (http://cr.yp.to/cdb.html)*/
@@ -33,7 +33,7 @@
#error Need type which holds 32 bits
#endif
-PHPAPI void uint32_pack(char *out, uint32 in);
-PHPAPI void uint32_unpack(const char *in, uint32 *out);
+void uint32_pack(char *out, uint32 in);
+void uint32_unpack(const char *in, uint32 *out);
#endif
Index: php4/ext/dba/libflatfile/flatfile.c
diff -u php4/ext/dba/libflatfile/flatfile.c:1.5
php4/ext/dba/libflatfile/flatfile.c:1.5.2.1
--- php4/ext/dba/libflatfile/flatfile.c:1.5 Wed Nov 13 11:28:43 2002
+++ php4/ext/dba/libflatfile/flatfile.c Mon Nov 18 20:07:09 2002
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: flatfile.c,v 1.5 2002/11/13 16:28:43 helly Exp $ */
+/* $Id: flatfile.c,v 1.5.2.1 2002/11/19 01:07:09 edink Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -46,7 +46,7 @@
/* {{{ flatfile_store
*/
-PHPAPI int flatfile_store(flatfile *dba, datum key_datum, datum value_datum, int mode
TSRMLS_DC) {
+int flatfile_store(flatfile *dba, datum key_datum, datum value_datum, int mode
+TSRMLS_DC) {
if (mode == FLATFILE_INSERT) {
if (flatfile_findkey(dba, key_datum TSRMLS_CC)) {
return 1;
@@ -78,7 +78,7 @@
/* {{{ flatfile_fetch
*/
-PHPAPI datum flatfile_fetch(flatfile *dba, datum key_datum TSRMLS_DC) {
+datum flatfile_fetch(flatfile *dba, datum key_datum TSRMLS_DC) {
datum value_datum = {NULL, 0};
size_t num=0;
size_t buf_size = 1024;
@@ -107,7 +107,7 @@
/* {{{ flatfile_delete
*/
-PHPAPI int flatfile_delete(flatfile *dba, datum key_datum TSRMLS_DC) {
+int flatfile_delete(flatfile *dba, datum key_datum TSRMLS_DC) {
char *key = key_datum.dptr;
size_t size = key_datum.dsize;
@@ -167,7 +167,7 @@
/* {{{ flatfile_findkey
*/
-PHPAPI int flatfile_findkey(flatfile *dba, datum key_datum TSRMLS_DC) {
+int flatfile_findkey(flatfile *dba, datum key_datum TSRMLS_DC) {
char *buf = NULL;
size_t num;
size_t buf_size = 1024;
@@ -214,7 +214,7 @@
/* {{{ flatfile_firstkey
*/
-PHPAPI datum flatfile_firstkey(flatfile *dba TSRMLS_DC) {
+datum flatfile_firstkey(flatfile *dba TSRMLS_DC) {
datum buf;
size_t num;
size_t buf_size = 1024;
@@ -255,7 +255,7 @@
/* {{{ flatfile_nextkey
*/
-PHPAPI datum flatfile_nextkey(flatfile *dba TSRMLS_DC) {
+datum flatfile_nextkey(flatfile *dba TSRMLS_DC) {
datum buf;
size_t num;
size_t buf_size = 1024;
Index: php4/ext/dba/libflatfile/flatfile.h
diff -u php4/ext/dba/libflatfile/flatfile.h:1.4
php4/ext/dba/libflatfile/flatfile.h:1.4.2.1
--- php4/ext/dba/libflatfile/flatfile.h:1.4 Wed Nov 13 11:28:44 2002
+++ php4/ext/dba/libflatfile/flatfile.h Mon Nov 18 20:07:09 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: flatfile.h,v 1.4 2002/11/13 16:28:44 helly Exp $ */
+/* $Id: flatfile.h,v 1.4.2.1 2002/11/19 01:07:09 edink Exp $ */
#ifndef PHP_LIBDBM_H
#define PHP_LIBDBM_H
@@ -37,11 +37,11 @@
#define FLATFILE_INSERT 1
#define FLATFILE_REPLACE 0
-PHPAPI int flatfile_store(flatfile *dba, datum key_datum, datum value_datum, int mode
TSRMLS_DC);
-PHPAPI datum flatfile_fetch(flatfile *dba, datum key_datum TSRMLS_DC);
-PHPAPI int flatfile_delete(flatfile *dba, datum key_datum TSRMLS_DC);
-PHPAPI int flatfile_findkey(flatfile *dba, datum key_datum TSRMLS_DC);
-PHPAPI datum flatfile_firstkey(flatfile *dba TSRMLS_DC);
-PHPAPI datum flatfile_nextkey(flatfile *dba TSRMLS_DC);
+int flatfile_store(flatfile *dba, datum key_datum, datum value_datum, int mode
+TSRMLS_DC);
+datum flatfile_fetch(flatfile *dba, datum key_datum TSRMLS_DC);
+int flatfile_delete(flatfile *dba, datum key_datum TSRMLS_DC);
+int flatfile_findkey(flatfile *dba, datum key_datum TSRMLS_DC);
+datum flatfile_firstkey(flatfile *dba TSRMLS_DC);
+datum flatfile_nextkey(flatfile *dba TSRMLS_DC);
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
