Finish porting aspell - tested and works ok now

7 files changed, 16 insertions, 14 deletions

diff --git a/MODULES_STATUS b/MODULES_STATUS
index 49a677f8ce..61b2f3210c 100644
--- a/MODULES_STATUS
+++ b/MODULES_STATUS
@@ -8,3 +8,4 @@ DBA					Not yet ported
 mcrypt				Working
 mhash				Working
 dbase				Working
+aspell              Working
diff --git a/ext/aspell/aspell.c b/ext/aspell/aspell.c
index 0ed437294c..fd37c2f431 100644
--- a/ext/aspell/aspell.c
+++ b/ext/aspell/aspell.c
@@ -85,7 +85,6 @@ void php3_aspell_new(INTERNAL_FUNCTION_PARAMETERS)
 	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 @@ void php3_aspell_suggest(INTERNAL_FUNCTION_PARAMETERS)
 	aspellSuggestions *sug;
 	size_t i;
 
-	TLS_VARS;
 	
 	argc = ARG_COUNT(ht);
 	if (argc != 2 || getParameters(ht, argc, &scin,&word) == FAILURE) {
@@ -150,8 +148,8 @@ void php3_aspell_check(INTERNAL_FUNCTION_PARAMETERS)
    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 @@ void php3_aspell_check_raw(INTERNAL_FUNCTION_PARAMETERS)
   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_aspell_check_raw(INTERNAL_FUNCTION_PARAMETERS)
 }
 /* }}} */
 
-void php3_info_aspell(void)
+void php3_info_aspell(ZEND_MODULE_INFO_FUNC_ARGS)
 {
-	TLS_VARS;
 	php3_printf("ASpell support enabled");
 
 }
diff --git a/ext/aspell/config.h.stub b/ext/aspell/config.h.stub
index 8db1f1d3dc..4be31d352a 100644
--- a/ext/aspell/config.h.stub
+++ b/ext/aspell/config.h.stub
@@ -1,3 +1,4 @@
 /* Define if you want the ASPELL interface */
+#ifndef HAVE_ASPELL
 #define HAVE_ASPELL 0
-
+#endif
diff --git a/ext/aspell/config.m4 b/ext/aspell/config.m4
index 591c9ba505..bfec9c4223 100644
--- a/ext/aspell/config.m4
+++ b/ext/aspell/config.m4
@@ -19,6 +19,7 @@ AC_ARG_WITH(aspell,
     fi
     AC_DEFINE(HAVE_ASPELL)
     AC_MSG_RESULT(yes)
+	PHP_EXTENSION(aspell)
   else
     AC_MSG_ERROR(no)
   fi
diff --git a/ext/aspell/php3_aspell.h b/ext/aspell/php3_aspell.h
index 2282d0b453..e38907c03e 100644
--- a/ext/aspell/php3_aspell.h
+++ b/ext/aspell/php3_aspell.h
@@ -34,10 +34,10 @@
 #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_check_raw(INTERNAL_FUNCTION_PARAMETERS);
 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 */
diff --git a/ext/ereg/regex/regex.h b/ext/ereg/regex/regex.h
index 162b2b0a34..5645eb6aa3 100644
--- a/ext/ereg/regex/regex.h
+++ b/ext/ereg/regex/regex.h
@@ -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 @@ API_EXPORT(void) regfree(regex_t *);
 #ifdef __cplusplus
 }
 #endif
-/* ========= end header generated by ./mkh ========= */
+/* ========= end header generated by ././mkh ========= */
 #endif
diff --git a/regex/regex.h b/regex/regex.h
index 162b2b0a34..5645eb6aa3 100644
--- a/regex/regex.h
+++ b/regex/regex.h
@@ -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 @@ API_EXPORT(void) regfree(regex_t *);
 #ifdef __cplusplus
 }
 #endif
-/* ========= end header generated by ./mkh ========= */
+/* ========= end header generated by ././mkh ========= */
 #endif