archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

No need to declare functions used internally by DBA as PHPAPI. This

Browse source 
fixes windows build.
This commit is contained in:
Edin Kadribasic 2002-11-19 01:06:42 +00:00
parent b75f2df3d4
commit ff55850562
9 changed files with 44 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ext/dba/dba.dsp
View file

@ -43,8 +43,8 @@ RSC=rc.exe
# 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 @@ LINK32=link.exe
# 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"

14
ext/dba/libcdb/cdb.c
View file

@ -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);

14
ext/dba/libcdb/cdb.h
View file

@ -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)

10
ext/dba/libcdb/cdb_make.c
View file

@ -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;

10
ext/dba/libcdb/cdb_make.h
View file

@ -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

4
ext/dba/libcdb/uint32.c
View file

@ -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) |

4
ext/dba/libcdb/uint32.h
View file

@ -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

12
ext/dba/libflatfile/flatfile.c
View file

@ -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;

12
ext/dba/libflatfile/flatfile.h
View file

@ -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