MFH (fix windows build)

diff --git a/ext/dba/dba.dsp b/ext/dba/dba.dsp
index 7d8e9f7ed2254ae14ea030a77ce884023af58a1a..063d4e3ba2b3976f4ca2edc87d1680e24836af6c 100644 (file)
--- a/ext/dba/dba.dsp
+++ b/ext/dba/dba.dsp
@@ -43,8 +43,8 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release_TS"\r
 # 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 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 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\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 "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
@@ -70,8 +70,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug_TS"\r
 # 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 "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 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\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 "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

diff --git a/ext/dba/libcdb/cdb.c b/ext/dba/libcdb/cdb.c
index 7857fa20b07d8e2e7f2bb0e6c40baffc0c2a0639..fbc27eacebaec9568c954f3a4a1b7815e67d0e5e 100644 (file)
--- a/ext/dba/libcdb/cdb.c
+++ b/ext/dba/libcdb/cdb.c
@@ -73,7 +73,7 @@ static uint32 cdb_hashadd(uint32 h, unsigned char c)
 /* }}} */
 
 /* {{{ 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 @@ PHPAPI uint32 cdb_hash(char *buf, unsigned int len)
 /* }}} */
 
 /* {{{ 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 @@ PHPAPI void cdb_init(struct cdb *c, php_stream *fp TSRMLS_DC)
 /* }}} */
 
 /* {{{ 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 @@ PHPAPI int cdb_read(struct cdb *c, char *buf, unsigned int len, uint32 pos TSRML
 /* }}} */
 
 /* {{{ 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 @@ PHPAPI int cdb_findnext(struct cdb *c, char *key, unsigned int len TSRMLS_DC)
 /* }}} */
 
 /* {{{ 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);

diff --git a/ext/dba/libcdb/cdb.h b/ext/dba/libcdb/cdb.h
index 74dc6947d198ef1fa1d2ba7c2dd2c39d936be49f..a74ef2325bf87adbd118a0235023061a2c7c04dc 100644 (file)
--- a/ext/dba/libcdb/cdb.h
+++ b/ext/dba/libcdb/cdb.h
@@ -38,16 +38,16 @@ struct cdb {
        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)

diff --git a/ext/dba/libcdb/cdb_make.c b/ext/dba/libcdb/cdb_make.c
index 375747f108da172f9aa28c5bfcb31cc916d88f37..4023a154a678f01b5716ae221be76bbaf43fabf6 100644 (file)
--- a/ext/dba/libcdb/cdb_make.c
+++ b/ext/dba/libcdb/cdb_make.c
@@ -56,7 +56,7 @@ static int cdb_posplus(struct cdb_make *c, uint32 len)
 /* }}} */
 
 /* {{{ 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 @@ PHPAPI int cdb_make_start(struct cdb_make *c, php_stream * f TSRMLS_DC)
 /* }}} */
 
 /* {{{ 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 @@ PHPAPI int cdb_make_addend(struct cdb_make *c, unsigned int keylen, unsigned int
 /* }}} */
 
 /* {{{ 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 @@ PHPAPI int cdb_make_addbegin(struct cdb_make *c, unsigned int keylen, unsigned i
 }
 
 /* {{{ 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 @@ PHPAPI int cdb_make_add(struct cdb_make *c,char *key,unsigned int keylen,char *d
 /* }}} */
 
 /* {{{ 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;

diff --git a/ext/dba/libcdb/cdb_make.h b/ext/dba/libcdb/cdb_make.h
index 33e1ac6539a9fea0946f9bb5c2e5d8a8d0983978..e5fb65fe49ae7c3a60c526dc146c801722f606a6 100644 (file)
--- a/ext/dba/libcdb/cdb_make.h
+++ b/ext/dba/libcdb/cdb_make.h
@@ -54,10 +54,10 @@ struct cdb_make {
        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

diff --git a/ext/dba/libcdb/uint32.c b/ext/dba/libcdb/uint32.c
index 261a0025925d63f01ad01615c96cec712ed81fd3..223ad170ac4fb5ba99fc8a12f216f480298d823b 100644 (file)
--- a/ext/dba/libcdb/uint32.c
+++ b/ext/dba/libcdb/uint32.c
@@ -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 @@ PHPAPI void uint32_pack(char *out, uint32 in)
 /* }}} */
 
 /* {{{ 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) |

diff --git a/ext/dba/libcdb/uint32.h b/ext/dba/libcdb/uint32.h
index e7ba9a5becefd2e7db7459221699e3ac66a6042c..8eeaf8db484fc2f0674448b0f73cd7936bf11591 100644 (file)
--- a/ext/dba/libcdb/uint32.h
+++ b/ext/dba/libcdb/uint32.h
@@ -33,7 +33,7 @@ typedef unsigned long uint32;
 #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

diff --git a/ext/dba/libflatfile/flatfile.c b/ext/dba/libflatfile/flatfile.c
index f4c8a2f62110799c58dadf3a48907a688299caf0..4cb820875e795c6ebd5c1894791f6b27d3de937e 100644 (file)
--- a/ext/dba/libflatfile/flatfile.c
+++ b/ext/dba/libflatfile/flatfile.c
@@ -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 @@ PHPAPI int flatfile_store(flatfile *dba, datum key_datum, datum value_datum, int
 
 /* {{{ 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 @@ PHPAPI datum flatfile_fetch(flatfile *dba, datum key_datum TSRMLS_DC) {
 
 /* {{{ 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 @@ PHPAPI int flatfile_delete(flatfile *dba, datum key_datum TSRMLS_DC) {
 
 /* {{{ 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 @@ PHPAPI int flatfile_findkey(flatfile *dba, datum key_datum TSRMLS_DC) {
 
 /* {{{ 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 @@ PHPAPI datum flatfile_firstkey(flatfile *dba TSRMLS_DC) {
 
 /* {{{ 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;

diff --git a/ext/dba/libflatfile/flatfile.h b/ext/dba/libflatfile/flatfile.h
index f1dbafdc4f61c33165a078e58a18b0026b7fe60e..9c910ae15779bfdc23ad7488647d2e18e25a1c17 100644 (file)
--- a/ext/dba/libflatfile/flatfile.h
+++ b/ext/dba/libflatfile/flatfile.h
@@ -37,11 +37,11 @@ typedef struct {
 #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