cvs: /php4 MODULES_STATUS /php4/ext/aspell aspell.c config.h.stub config.m4 php3_aspell.h /php4/regex regex.h

rasmus Mon Jul 12 21:18:37 1999 EDT Modified files: /php4 MODULES_STATUS /php4/ext/aspell aspell.c config.h.stub config.m4 php3_aspell.h /php4/regex regex.h Log: Finish porting aspell - tested and works ok now Index: php4/MODULES_STATUS diff -u php4/MODULES_STATUS:1.3 php4/MODULES_STATUS:1.4 --- php4/MODULES_STATUS:1.3 Mon Jul 12 19:21:49 1999 +++ php4/MODULES_STATUS Mon Jul 12 21:17:48 1999 @@ -8,3 +8,4 @@ mcrypt Working mhash Working dbase Working +aspell Working Index: php4/ext/aspell/aspell.c diff -u php4/ext/aspell/aspell.c:1.1 php4/ext/aspell/aspell.c:1.2 --- php4/ext/aspell/aspell.c:1.1 Fri Jul 9 16:56:33 1999 +++ php4/ext/aspell/aspell.c Mon Jul 12 21:17:53 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: aspell.c,v 1.1 1999/07/09 14:56:33 rasmus Exp $ */ +/* $Id: aspell.c,v 1.2 1999/07/12 19:17:53 rasmus Exp $ */ #include "php.h" #if defined(COMPILE_DL) @@ -85,7 +85,6 @@ int argc; aspell *sc; int ind; - TLS_VARS; argc = ARG_COUNT(ht); if (argc < 1 || argc > 2 || getParameters(ht, argc, &master,&personal) == FAILURE) { @@ -116,7 +115,6 @@ aspellSuggestions *sug; size_t i; - TLS_VARS; argc = ARG_COUNT(ht); if (argc != 2 || getParameters(ht, argc, &scin,&word) == FAILURE) { @@ -150,8 +148,8 @@ int type; pval *scin,*word; aspell *sc; + int argc; - TLS_VARS; argc = ARG_COUNT(ht); if (argc != 2 || getParameters(ht, argc, &scin,&word) == FAILURE) { WRONG_PARAM_COUNT; @@ -183,7 +181,6 @@ int type; int argc; aspell *sc; - TLS_VARS; argc = ARG_COUNT(ht); if (argc != 2 || getParameters(ht, argc, &scin,&word) == FAILURE) { @@ -208,9 +205,8 @@ } /* }}} */ -void php3_info_aspell(void) +void php3_info_aspell(ZEND_MODULE_INFO_FUNC_ARGS) { - TLS_VARS; php3_printf("ASpell support enabled"); } Index: php4/ext/aspell/config.h.stub diff -u php4/ext/aspell/config.h.stub:1.1 php4/ext/aspell/config.h.stub:1.2 --- php4/ext/aspell/config.h.stub:1.1 Fri Jul 9 16:56:33 1999 +++ php4/ext/aspell/config.h.stub Mon Jul 12 21:17:53 1999 @@ -1,3 +1,4 @@ /* Define if you want the ASPELL interface */ +#ifndef HAVE_ASPELL #define HAVE_ASPELL 0 - +#endif Index: php4/ext/aspell/config.m4 diff -u php4/ext/aspell/config.m4:1.1 php4/ext/aspell/config.m4:1.2 --- php4/ext/aspell/config.m4:1.1 Fri Jul 9 16:56:33 1999 +++ php4/ext/aspell/config.m4 Mon Jul 12 21:17:53 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.1 1999/07/09 14:56:33 rasmus Exp $ +dnl $Id: config.m4,v 1.2 1999/07/12 19:17:53 rasmus Exp $ AC_MSG_CHECKING(for ASPELL support) AC_ARG_WITH(aspell, @@ -19,6 +19,7 @@ fi AC_DEFINE(HAVE_ASPELL) AC_MSG_RESULT(yes) + PHP_EXTENSION(aspell) else AC_MSG_ERROR(no) fi Index: php4/ext/aspell/php3_aspell.h diff -u php4/ext/aspell/php3_aspell.h:1.1 php4/ext/aspell/php3_aspell.h:1.2 --- php4/ext/aspell/php3_aspell.h:1.1 Fri Jul 9 16:56:33 1999 +++ php4/ext/aspell/php3_aspell.h Mon Jul 12 21:17:53 1999 @@ -28,16 +28,16 @@ */ -/* $Id: php3_aspell.h,v 1.1 1999/07/09 14:56:33 rasmus Exp $ */ +/* $Id: php3_aspell.h,v 1.2 1999/07/12 19:17:53 rasmus Exp $ */ #ifndef _ASPELL_H #define _ASPELL_H #if HAVE_ASPELL extern php3_module_entry aspell_module_entry; -#define php3_aspell_module_ptr &aspell_module_entry +#define aspell_module_ptr &aspell_module_entry extern int php3_minit_aspell(INIT_FUNC_ARGS); -extern void php3_info_aspell(void); +extern void php3_info_aspell(ZEND_MODULE_INFO_FUNC_ARGS); extern void php3_aspell_close(); void php3_aspell_new(INTERNAL_FUNCTION_PARAMETERS); void php3_aspell_check(INTERNAL_FUNCTION_PARAMETERS); @@ -45,6 +45,9 @@ void php3_aspell_suggest(INTERNAL_FUNCTION_PARAMETERS); #else -#define php3_aspell_module_ptr NULL +#define aspell_module_ptr NULL #endif + +#define phpext_aspell_ptr aspell_module_ptr + #endif /* _ASPELL_H */ Index: php4/regex/regex.h diff -u php4/regex/regex.h:1.1 php4/regex/regex.h:1.2 --- php4/regex/regex.h:1.1 Wed Apr 7 23:05:04 1999 +++ php4/regex/regex.h Mon Jul 12 21:18:07 1999 @@ -1,6 +1,6 @@ #ifndef _REGEX_H_ #define _REGEX_H_ /* never again */ -/* ========= begin header generated by ./mkh ========= */ +/* ========= begin header generated by ././mkh ========= */ #ifdef __cplusplus extern "C" { #endif @@ -75,5 +75,5 @@ #ifdef __cplusplus } #endif -/* ========= end header generated by ./mkh ========= */ +/* ========= end header generated by ././mkh ========= */ #endif