summaryrefslogtreecommitdiff
path: root/ext/dba/libcdb
diff options
context:
space:
mode:
authorEdin Kadribasic <edink@php.net>2002-11-19 01:06:42 +0000
committerEdin Kadribasic <edink@php.net>2002-11-19 01:06:42 +0000
commitff55850562f70b609901864e79856151ff35d57c (patch)
treee175a954e57873e4ad0081e3fff31fcb0a088e28 /ext/dba/libcdb
parentb75f2df3d433d9d4fb795a1ce131d54aebeef3f6 (diff)
downloadphp-git-ff55850562f70b609901864e79856151ff35d57c.tar.gz
No need to declare functions used internally by DBA as PHPAPI. This
fixes windows build.
Diffstat (limited to 'ext/dba/libcdb')
-rw-r--r--ext/dba/libcdb/cdb.c14
-rw-r--r--ext/dba/libcdb/cdb.h14
-rw-r--r--ext/dba/libcdb/cdb_make.c10
-rw-r--r--ext/dba/libcdb/cdb_make.h10
-rw-r--r--ext/dba/libcdb/uint32.c4
-rw-r--r--ext/dba/libcdb/uint32.h4
6 files changed, 28 insertions, 28 deletions
diff --git a/ext/dba/libcdb/cdb.c b/ext/dba/libcdb/cdb.c
index 7857fa20b0..fbc27eaceb 100644
--- 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 74dc6947d1..a74ef2325b 100644
--- 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 375747f108..4023a154a6 100644
--- 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 33e1ac6539..e5fb65fe49 100644
--- 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 261a002592..223ad170ac 100644
--- 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 e7ba9a5bec..8eeaf8db48 100644
--- 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