cvs: /php3/functions php3_mcal.c php3_mcal.h php_ftp.c php_ftp.h

askalski Thu Sep 23 11:46:19 1999 EDT Modified files: /php3/functions php3_mcal.c php3_mcal.h php_ftp.c php_ftp.h Log: fixed mcal/ftp function naming error Index: php3/functions/php3_mcal.c diff -u php3/functions/php3_mcal.c:1.30 php3/functions/php3_mcal.c:1.31 --- php3/functions/php3_mcal.c:1.30 Thu Sep 23 10:34:18 1999 +++ php3/functions/php3_mcal.c Thu Sep 23 11:46:19 1999 @@ -131,7 +131,7 @@ CALVER, mcal_functions, PHP_MINIT(mcal), NULL, NULL, NULL, PHP_MINFO(mcal), 0, 0, 0, NULL }; #else -php3_module_entry php3_mcal_module_entry = {"mcal", mcal_functions, PHP_MINIT_FUNCTION, NULL, NULL, NULL, PHP_MINFO_FUNCTION, 0, 0, 0, NULL}; +php3_module_entry php3_mcal_module_entry = {"mcal", mcal_functions, php3_minit_mcal, NULL, NULL, NULL, php3_minfo_mcal, 0, 0, 0, NULL}; #endif #if COMPILE_DL @@ -156,10 +156,10 @@ } -#ifdef ZEND_VERSION -PHP_MINFO_FUNCTION(mcal) +#ifndef ZEND_VERSION +void php3_minfo_mcal(void) #else -void PHP_MINFO_FUNCTION(void) +PHP_MINFO_FUNCTION(mcal) #endif { php3_printf("Mcal Support enabled<br>"); @@ -169,10 +169,10 @@ php3_printf("</tr></table>"); } -#ifdef ZEND_VERSION -PHP_MINIT_FUNCTION(mcal) +#ifndef ZEND_VERSION +int php3_minit_mcal(INIT_FUNC_ARGS) #else -int PHP_MINIT_FUNCTION(INIT_FUNC_ARGS) +PHP_MINIT_FUNCTION(mcal) #endif { Index: php3/functions/php3_mcal.h diff -u php3/functions/php3_mcal.h:1.12 php3/functions/php3_mcal.h:1.13 --- php3/functions/php3_mcal.h:1.12 Tue Sep 14 14:15:17 1999 +++ php3/functions/php3_mcal.h Thu Sep 23 11:46:19 1999 @@ -1,4 +1,4 @@ -/* $Id: php3_mcal.h,v 1.12 1999/09/14 18:15:17 musone Exp $ */ +/* $Id: php3_mcal.h,v 1.13 1999/09/23 15:46:19 askalski Exp $ */ #ifndef _INCLUDED_MCAL_H #define _INCLUDED_MCAL_H @@ -24,16 +24,13 @@ #define phpext_mcal_ptr php3_mcal_module_ptr #ifdef ZEND_VERSION -extern PHP_MINIT_FUNCTION(mcal); +PHP_MINIT_FUNCTION(mcal); PHP_MINFO_FUNCTION(mcal); #else -extern int PHP_MINIT_FUNCTION(INIT_FUNC_ARGS); -extern void PHP_MINFO_FUNCTION(void); +int php3_minit_mcal(INIT_FUNC_ARGS); +void php3_minfo_mcal(void); #endif - -extern int mcal_init_request(INIT_FUNC_ARGS); -extern int mcal_end_request(void); void make_event_object(); void php3_event_init(); Index: php3/functions/php_ftp.c diff -u php3/functions/php_ftp.c:1.3 php3/functions/php_ftp.c:1.4 --- php3/functions/php_ftp.c:1.3 Wed Sep 22 12:08:11 1999 +++ php3/functions/php_ftp.c Thu Sep 23 11:46:19 1999 @@ -28,7 +28,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ftp.c,v 1.3 1999/09/22 16:08:11 askalski Exp $ */ +/* $Id: php_ftp.c,v 1.4 1999/09/23 15:46:19 askalski Exp $ */ #include "php.h" @@ -69,7 +69,7 @@ #ifdef ZEND_VERSION PHP_MINIT(ftp), #else - PHP_MINIT_FUNCTION, + php3_minit_ftp, #endif NULL, NULL, @@ -83,10 +83,10 @@ ftp_close(ftp); } -#ifdef ZEND_VERSION -PHP_MINIT_FUNCTION(ftp) +#ifndef ZEND_VERSION +int php3_minit_ftp(INIT_FUNC_ARGS) #else -int PHP_MINIT_FUNCTION(INIT_FUNC_ARGS) +PHP_MINIT_FUNCTION(ftp) #endif { le_ftpbuf = register_list_destructors(ftp_destructor_ftpbuf, NULL); Index: php3/functions/php_ftp.h diff -u php3/functions/php_ftp.h:1.2 php3/functions/php_ftp.h:1.3 --- php3/functions/php_ftp.h:1.2 Wed Sep 22 12:08:11 1999 +++ php3/functions/php_ftp.h Thu Sep 23 11:46:19 1999 @@ -28,7 +28,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ftp.h,v 1.2 1999/09/22 16:08:11 askalski Exp $ */ +/* $Id: php_ftp.h,v 1.3 1999/09/23 15:46:19 askalski Exp $ */ #ifndef _INCLUDED_FTP_H #define _INCLUDED_FTP_H @@ -46,7 +46,7 @@ #ifdef ZEND_VERSION PHP_MINIT_FUNCTION(ftp); #else -int PHP_MINIT_FUNCTION(INIT_FUNC_ARGS); +int php3_minit_ftp(INIT_FUNC_ARGS); #endif PHP_FUNCTION(ftp_connect);