cvs: pecl /kakasi kakasi.c php_kakasi.h

moriyoshi Sat Aug 9 20:32:33 2003 EDT Modified files: /pecl/kakasi kakasi.c php_kakasi.h Log: - Remove confusing macros Index: pecl/kakasi/kakasi.c diff -u pecl/kakasi/kakasi.c:1.2 pecl/kakasi/kakasi.c:1.3 --- pecl/kakasi/kakasi.c:1.2 Sat Aug 9 20:28:51 2003 +++ pecl/kakasi/kakasi.c Sat Aug 9 20:32:33 2003 @@ -14,7 +14,7 @@ 2001/12/3 Release 0.3.0 */ -/* $Id: kakasi.c,v 1.2 2003/08/10 00:28:51 moriyoshi Exp $ */ +/* $Id: kakasi.c,v 1.3 2003/08/10 00:32:33 moriyoshi Exp $ */ #ifdef HAVE_CONFIG_H @@ -64,13 +64,8 @@ STANDARD_MODULE_HEADER, "kakasi", kakasi_functions, -#ifdef ZTS PHP_MINIT(kakasi), PHP_MSHUTDOWN(kakasi), -#else - NULL, - NULL, -#endif NULL, NULL, NULL, @@ -84,22 +79,22 @@ #endif -#ifdef ZTS PHP_MINIT_FUNCTION(kakasi) { +#ifdef ZTS php_kakasi_lock_id = tsrm_mutex_alloc(); - +#endif return SUCCESS; } PHP_MSHUTDOWN_FUNCTION(kakasi) { +#ifdef ZTS tsrm_mutex_free(php_kakasi_lock_id); php_kakasi_lock_id = NULL; - +#endif return SUCCESS; } -#endif /* {{{ proto string kakasi(string string, array option) kakasi command */ Index: pecl/kakasi/php_kakasi.h diff -u pecl/kakasi/php_kakasi.h:1.1 pecl/kakasi/php_kakasi.h:1.2 --- pecl/kakasi/php_kakasi.h:1.1 Wed Jan 9 04:10:31 2002 +++ pecl/kakasi/php_kakasi.h Sat Aug 9 20:32:33 2003 @@ -2,7 +2,7 @@ php_kakasi.h */ -/* $Id: php_kakasi.h,v 1.1 2002/01/09 09:10:31 yohgaki Exp $ */ +/* $Id: php_kakasi.h,v 1.2 2003/08/10 00:32:33 moriyoshi Exp $ */ #ifndef _PHP_KAKASI_H @@ -13,10 +13,8 @@ extern zend_module_entry kakasi_module_entry; #define phpext_kakasi_ptr &kakasi_module_entry -#ifdef ZTS PHP_MINIT_FUNCTION(kakasi); PHP_MSHUTDOWN_FUNCTION(kakasi); -#endif PHP_FUNCTION(kakasi); PHP_FUNCTION(kakasi_asort);