cvs: /php4/ext/icap php_icap.c /php4/ext/icap php3_icap.c /php4/ext/icap Makefile.am php_icap.h

zeev Fri Dec 17 17:01:10 1999 EDT Added files: /php4/ext/icap php_icap.c Removed files: /php4/ext/icap php3_icap.c Modified files: /php4/ext/icap Makefile.am php_icap.h Log: More cleanup Index: php4/ext/icap/Makefile.am diff -u php4/ext/icap/Makefile.am:1.4 php4/ext/icap/Makefile.am:1.5 --- php4/ext/icap/Makefile.am:1.4 Sat Nov 13 07:40:36 1999 +++ php4/ext/icap/Makefile.am Fri Dec 17 17:01:09 1999 @@ -1,5 +1,5 @@ -# $Id: Makefile.am,v 1.4 1999/11/13 12:40:36 sas Exp $ +# $Id: Makefile.am,v 1.5 1999/12/17 22:01:09 zeev Exp $ noinst_LTLIBRARIES=libphpext_icap.la -libphpext_icap_la_SOURCES=php3_icap.c +libphpext_icap_la_SOURCES=php_icap.c Index: php4/ext/icap/php_icap.h diff -u php4/ext/icap/php_icap.h:1.2 php4/ext/icap/php_icap.h:1.3 --- php4/ext/icap/php_icap.h:1.2 Fri Dec 17 15:55:03 1999 +++ php4/ext/icap/php_icap.h Fri Dec 17 17:01:09 1999 @@ -1,4 +1,4 @@ -/* $Id: php_icap.h,v 1.2 1999/12/17 20:55:03 zeev Exp $ */ +/* $Id: php_icap.h,v 1.3 1999/12/17 22:01:09 zeev Exp $ */ #ifndef _INCLUDED_ICAP_H #define _INCLUDED_ICAP_H @@ -21,32 +21,29 @@ PHP_MINFO_FUNCTION(icap); /* Functions accessable to PHP */ -extern zend_module_entry php3_icap_module_entry; -#define php3_icap_module_ptr &php3_icap_module_entry -#define phpext_icap_ptr php3_icap_module_ptr +extern zend_module_entry php_icap_module_entry; +#define php_icap_module_ptr &php_icap_module_entry +#define phpext_icap_ptr php_icap_module_ptr extern int icap_init_request(INIT_FUNC_ARGS); extern int icap_end_request(void); -void php3_icap_open(INTERNAL_FUNCTION_PARAMETERS); -void php3_icap_popen(INTERNAL_FUNCTION_PARAMETERS); -void php3_icap_reopen(INTERNAL_FUNCTION_PARAMETERS); -void php3_icap_close(INTERNAL_FUNCTION_PARAMETERS); -void php3_icap_fetch_event(INTERNAL_FUNCTION_PARAMETERS); -void php3_icap_list_events(INTERNAL_FUNCTION_PARAMETERS); -void php3_icap_create_calendar(INTERNAL_FUNCTION_PARAMETERS); -void php3_icap_rename_calendar(INTERNAL_FUNCTION_PARAMETERS); -void php3_icap_delete_calendar(INTERNAL_FUNCTION_PARAMETERS); -void php3_icap_store_event(INTERNAL_FUNCTION_PARAMETERS); -void php3_icap_delete_event(INTERNAL_FUNCTION_PARAMETERS); -void php3_icap_snooze(INTERNAL_FUNCTION_PARAMETERS); -void php3_icap_list_alarms(INTERNAL_FUNCTION_PARAMETERS); +PHP_FUNCTION(icap_open); +PHP_FUNCTION(icap_popen); +PHP_FUNCTION(icap_reopen); +PHP_FUNCTION(icap_close); +PHP_FUNCTION(icap_fetch_event); +PHP_FUNCTION(icap_list_events); +PHP_FUNCTION(icap_create_calendar); +PHP_FUNCTION(icap_rename_calendar); +PHP_FUNCTION(icap_delete_calendar); +PHP_FUNCTION(icap_store_event); +PHP_FUNCTION(icap_delete_event); +PHP_FUNCTION(icap_snooze); +PHP_FUNCTION(icap_list_alarms); - - - #else -#define php3_icap_module_ptr NULL +#define php_icap_module_ptr NULL #endif /* HAVE_ICAP */