* added --enable-thread-safety switch

* now generating internal_functions.c

5 files changed, 12 insertions, 16 deletions

diff --git a/ext/bcmath/php3_bcmath.h b/ext/bcmath/php3_bcmath.h
index 68fb5fa911..8656f83339 100644
--- a/ext/bcmath/php3_bcmath.h
+++ b/ext/bcmath/php3_bcmath.h
@@ -41,7 +41,7 @@
 #if WITH_BCMATH
 
 extern php3_module_entry bcmath_module_entry;
-#define bcmath_module_ptr &bcmath_module_entry
+#define phpext_bcmath_ptr &bcmath_module_entry
 
 extern int php3_rinit_bcmath(INIT_FUNC_ARGS);
 extern int php3_rend_bcmath(SHUTDOWN_FUNC_ARGS);
@@ -57,7 +57,7 @@ extern void php3_bcmath_set_scale(INTERNAL_FUNCTION_PARAMETERS);
 
 #else
 
-#define bcmath_module_ptr NULL
+#define phpext_bcmath_ptr NULL
 
 #endif
 
diff --git a/ext/db/db.c b/ext/db/db.c
index d5400c819e..70ba058b03 100644
--- a/ext/db/db.c
+++ b/ext/db/db.c
@@ -158,14 +158,10 @@ int flatfile_findkey(FILE *dbf, datum key);
 int flatfile_delete(FILE *dbf, datum key);
 datum flatfile_firstkey(FILE *dbf);
 datum flatfile_nextkey(FILE *dbf);
-#ifdef PHP_31
-#include "php3_db.h"
-#include "ext/standard/php3_string.h"
-#else
-#endif
 
 #endif
-#include "db.h"
+
+#include "php3_db.h"
 #include "ext/standard/php3_string.h"
 
 #if THREAD_SAFE
diff --git a/ext/db/db.h b/ext/db/php3_db.h
index acda632ac8..ded7774ffd 100644
--- a/ext/db/db.h
+++ b/ext/db/php3_db.h
@@ -41,7 +41,7 @@
 
 
 extern php3_module_entry dbm_module_entry;
-#define dbm_module_ptr &dbm_module_entry
+#define phpext_db_ptr &dbm_module_entry
 
 
 
@@ -58,8 +58,8 @@ typedef struct dbm_info {
   do not want flatfile compiled staticly
 */
 #if defined(MSVC5) && !defined(COMPILE_DL)
-#undef dbm_module_ptr
-#define dbm_module_ptr NULL
+#undef phpext_db_ptr
+#define phpext_db_ptr NULL
 #endif
 
 dbm_info *_php3_finddbm(pval *id,HashTable *list);
@@ -88,7 +88,7 @@ extern void php3_dbmdelete(INTERNAL_FUNCTION_PARAMETERS);
 extern void php3_dbmfirstkey(INTERNAL_FUNCTION_PARAMETERS);
 extern void php3_dbmnextkey(INTERNAL_FUNCTION_PARAMETERS);
 
-#undef dbm_module_ptr
-#define dbm_module_ptr	NULL
+#undef phpext_db_ptr
+#define phpext_db_ptr	NULL
 
 #endif /* _PHP3_DB_H */
diff --git a/ext/gd/php3_gd.h b/ext/gd/php3_gd.h
index 912fa5d740..ea25c06aca 100644
--- a/ext/gd/php3_gd.h
+++ b/ext/gd/php3_gd.h
@@ -44,7 +44,7 @@
 #include <gd.h>
 
 extern php3_module_entry gd_module_entry;
-#define gd_module_ptr &gd_module_entry
+#define phpext_gd_ptr &gd_module_entry
 
 /* gd.c functions */
 extern void php3_info_gd(void);
@@ -95,7 +95,7 @@ extern void php3_imagettftext(INTERNAL_FUNCTION_PARAMETERS);
 #endif
 #else
 
-#define gd_module_ptr NULL
+#define phpext_gd_ptr NULL
 
 #endif
 
diff --git a/ext/standard/php3_standard.h b/ext/standard/php3_standard.h
index a3920e30e7..6d52439991 100644
--- a/ext/standard/php3_standard.h
+++ b/ext/standard/php3_standard.h
@@ -66,7 +66,7 @@
 #include "post.h"
 #include "mime.h"
 
-#define standard_module_ptr basic_functions_module_ptr
+#define phpext_standard_ptr basic_functions_module_ptr
 
 /*
  * Local variables: