5 files changed, 32 insertions, 32 deletions

diff --git a/ext/dbase/dbase.c b/ext/dbase/dbase.c
index 171b789ebb..6e169a6409 100644
--- a/ext/dbase/dbase.c
+++ b/ext/dbase/dbase.c
@@ -116,7 +116,7 @@ static int php3_mend_dbase(void){
 
 /* {{{ proto int dbase_open(string name, int mode)
    Opens a dBase-format database file */
-void php3_dbase_open(INTERNAL_FUNCTION_PARAMETERS) {
+PHP_FUNCTION(dbase_open) {
 	pval *dbf_name, *options;
 	dbhead_t *dbh;
 	int handle;
@@ -149,7 +149,7 @@ void php3_dbase_open(INTERNAL_FUNCTION_PARAMETERS) {
 
 /* {{{ proto bool dbase_close(int identifier)
    Closes an open dBase-format database file */
-void php3_dbase_close(INTERNAL_FUNCTION_PARAMETERS) {
+PHP_FUNCTION(dbase_close) {
 	pval *dbh_id;
 	dbhead_t *dbh;
 	int dbh_type;
@@ -172,7 +172,7 @@ void php3_dbase_close(INTERNAL_FUNCTION_PARAMETERS) {
 
 /* {{{ proto int dbase_numrecords(int identifier)
    Returns the number of records in the database */
-void php3_dbase_numrecords(INTERNAL_FUNCTION_PARAMETERS) {
+PHP_FUNCTION(dbase_numrecords) {
 	pval *dbh_id;
 	dbhead_t *dbh;
 	int dbh_type;
@@ -194,7 +194,7 @@ void php3_dbase_numrecords(INTERNAL_FUNCTION_PARAMETERS) {
 
 /* {{{ proto int dbase_numfields(int identifier)
    Returns the number of fields (columns) in the database */
-void php3_dbase_numfields(INTERNAL_FUNCTION_PARAMETERS) {
+PHP_FUNCTION(dbase_numfields) {
 	pval *dbh_id;
 	dbhead_t *dbh;
 	int dbh_type;
@@ -216,7 +216,7 @@ void php3_dbase_numfields(INTERNAL_FUNCTION_PARAMETERS) {
 
 /* {{{ proto bool dbase_pack(int identifier)
    Packs the database (deletes records marked for deletion) */
-void php3_dbase_pack(INTERNAL_FUNCTION_PARAMETERS) {
+PHP_FUNCTION(dbase_pack) {
 	pval *dbh_id;
 	dbhead_t *dbh;
 	int dbh_type;
@@ -240,7 +240,7 @@ void php3_dbase_pack(INTERNAL_FUNCTION_PARAMETERS) {
 
 /* {{{ proto bool dbase_add_record(int identifier, array data)
    Adds a record to the database */
-void php3_dbase_add_record(INTERNAL_FUNCTION_PARAMETERS) {
+PHP_FUNCTION(dbase_add_record) {
 	pval *dbh_id, *fields, *field;
 	dbhead_t *dbh;
 	int dbh_type;
@@ -308,7 +308,7 @@ void php3_dbase_add_record(INTERNAL_FUNCTION_PARAMETERS) {
 
 /* {{{ proto bool dbase_delete_record(int identifier, int record)
    Marks a record to be deleted */
-void php3_dbase_delete_record(INTERNAL_FUNCTION_PARAMETERS) {
+PHP_FUNCTION(dbase_delete_record) {
 	pval *dbh_id, *record;
 	dbhead_t *dbh;
 	int dbh_type;
@@ -342,7 +342,7 @@ void php3_dbase_delete_record(INTERNAL_FUNCTION_PARAMETERS) {
 
 /* {{{ proto array dbase_get_record(int identifier, int record)
    Returns an array representing a record from the database */
-void php3_dbase_get_record(INTERNAL_FUNCTION_PARAMETERS) {
+PHP_FUNCTION(dbase_get_record) {
 	pval *dbh_id, *record;
 	dbhead_t *dbh;
 	int dbh_type;
@@ -420,7 +420,7 @@ void php3_dbase_get_record(INTERNAL_FUNCTION_PARAMETERS) {
 /* From Martin Kuba <makub@aida.inet.cz> */
 /* {{{ proto array dbase_get_record_with_names(int identifier, int record)
    Returns an associative array representing a record from the database */
-void php3_dbase_get_record_with_names(INTERNAL_FUNCTION_PARAMETERS) {
+PHP_FUNCTION(dbase_get_record_with_names) {
 	pval *dbh_id, *record;
 	dbhead_t *dbh;
 	int dbh_type;
@@ -495,7 +495,7 @@ void php3_dbase_get_record_with_names(INTERNAL_FUNCTION_PARAMETERS) {
 
 /* {{{ proto bool dbase_create(string filename, array fields)
    Creates a new dBase-format database file */
-void php3_dbase_create(INTERNAL_FUNCTION_PARAMETERS) {
+PHP_FUNCTION(dbase_create) {
 	pval *filename, *fields, *field, *value;
 	int fd;
 	dbhead_t *dbh;
diff --git a/ext/dbase/dbf_head.h b/ext/dbase/dbf_head.h
index 481e085027..1643151dd1 100644
--- a/ext/dbase/dbf_head.h
+++ b/ext/dbase/dbf_head.h
@@ -1,9 +1,9 @@
 extern dbhead_t *get_dbf_head(int fd);
-extern void free_dbf_head(dbhead_t *dbh);
+void free_dbf_head(dbhead_t *dbh);
 extern int put_dbf_head(dbhead_t *dbh);
 extern int get_dbf_field(dbhead_t *dbh, dbfield_t *dbf);
 extern int put_dbf_field(dbhead_t *dbh, dbfield_t *dbf);
-extern void put_dbf_info(dbhead_t *dbh);
+void put_dbf_info(dbhead_t *dbh);
 extern char *get_dbf_f_fmt(dbfield_t *dbf);
 extern dbhead_t *dbf_open(char *dp, int o_flags);
-extern void dbf_head_info(dbhead_t *dbh);
+void dbf_head_info(dbhead_t *dbh);
diff --git a/ext/dbase/dbf_misc.h b/ext/dbase/dbf_misc.h
index ce2e80d7a1..37fe8b0ea9 100644
--- a/ext/dbase/dbf_misc.h
+++ b/ext/dbase/dbf_misc.h
@@ -1,12 +1,12 @@
-extern void put_long(char *cp, long lval);
+void put_long(char *cp, long lval);
 extern long get_long(char *cp);
 extern int get_short(char *cp);
-extern void put_short(char *cp, int sval);
-extern void put_double(char *cp, double fval);
+void put_short(char *cp, int sval);
+void put_double(char *cp, double fval);
 extern double get_double(char *cp);
-extern void copy_fill(char *dp, char *sp, int len);
-extern void copy_crimp(char *dp, char *sp, int len);
-extern void db_set_date(char *cp, int year, int month, int day);
+void copy_fill(char *dp, char *sp, int len);
+void copy_crimp(char *dp, char *sp, int len);
+void db_set_date(char *cp, int year, int month, int day);
 extern int db_date_year(char *cp);
 extern int db_date_month(char *cp);
 extern int db_date_day(char *cp);
diff --git a/ext/dbase/dbf_rec.h b/ext/dbase/dbf_rec.h
index 6eb40455a7..6407c702f6 100644
--- a/ext/dbase/dbf_rec.h
+++ b/ext/dbase/dbf_rec.h
@@ -2,9 +2,9 @@ extern char *get_dbf_record(dbhead_t *dbh, long rec_num);
 extern long put_dbf_record(dbhead_t *dbh, long rec_num, char *cp);
 extern int put_piece(dbhead_t *dbh, long offset, char *cp, int len);
 extern int del_dbf_record(dbhead_t *dbh, long rec_num);
-extern void pack_dbf(dbhead_t *dbh);
+void pack_dbf(dbhead_t *dbh);
 extern char *get_field_val(char *rp, dbfield_t *fldp, char *cp);
-extern void put_field_val(char *rp, dbfield_t *fldp, char *cp);
-extern void out_rec(dbhead_t *dbh, dbfield_t *dbf, char *cp);
+void put_field_val(char *rp, dbfield_t *fldp, char *cp);
+void out_rec(dbhead_t *dbh, dbfield_t *dbf, char *cp);
 extern int is_valid_rec(char *cp);
 extern char *dbf_get_next(dbhead_t *dbh);
diff --git a/ext/dbase/php_dbase.h b/ext/dbase/php_dbase.h
index 35f78163bd..3eb82d094b 100644
--- a/ext/dbase/php_dbase.h
+++ b/ext/dbase/php_dbase.h
@@ -36,16 +36,16 @@ extern php3_module_entry dbase_module_entry;
 #define dbase_module_ptr &dbase_module_entry
 
 extern int php3_minit_dbase(INIT_FUNC_ARGS);
-extern void php3_dbase_open(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_dbase_create(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_dbase_close(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_dbase_numrecords(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_dbase_numfields(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_dbase_add_record(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_dbase_get_record(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_dbase_delete_record(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_dbase_pack(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_dbase_get_record_with_names(INTERNAL_FUNCTION_PARAMETERS);
+PHP_FUNCTION(dbase_open);
+PHP_FUNCTION(dbase_create);
+PHP_FUNCTION(dbase_close);
+PHP_FUNCTION(dbase_numrecords);
+PHP_FUNCTION(dbase_numfields);
+PHP_FUNCTION(dbase_add_record);
+PHP_FUNCTION(dbase_get_record);
+PHP_FUNCTION(dbase_delete_record);
+PHP_FUNCTION(dbase_pack);
+PHP_FUNCTION(dbase_get_record_with_names);
 #else
 #define dbase_module_ptr NULL
 #endif