- fix compile issues for various packages (dbase, sysv*, zlib)

- some cleanup in mhash/mcrypt

12 files changed, 31 insertions, 22 deletions

diff --git a/ext/dbase/dbase.c b/ext/dbase/dbase.c
index cd9ba2e8ad..171b789ebb 100644
--- a/ext/dbase/dbase.c
+++ b/ext/dbase/dbase.c
@@ -38,8 +38,8 @@
 #include "php_globals.h"
 
 #if DBASE
-#include "dbase.h"
-#include "../dbase/dbf.h"
+#include "php_dbase.h"
+#include "dbf.h"
 #if defined(THREAD_SAFE)
 DWORD DbaseTls;
 static int numthreads=0;
diff --git a/ext/dbase/dbase.h b/ext/dbase/php_dbase.h
index bcc0b5777b..35f78163bd 100644
--- a/ext/dbase/dbase.h
+++ b/ext/dbase/php_dbase.h
@@ -49,4 +49,7 @@ extern void php3_dbase_get_record_with_names(INTERNAL_FUNCTION_PARAMETERS);
 #else
 #define dbase_module_ptr NULL
 #endif
+
+#define phpext_dbase_ptr dbase_module_ptr
+
 #endif /* _DBASE_H */
diff --git a/ext/gettext/gettext.c b/ext/gettext/gettext.c
index 1c9a9fefd1..3f85d7ce75 100644
--- a/ext/gettext/gettext.c
+++ b/ext/gettext/gettext.c
@@ -31,7 +31,6 @@
 
 #include <stdio.h>
 #include "php.h"
-#include "internal_functions.h"
 #include "php3_gettext.h"
 
 #if HAVE_LIBINTL
diff --git a/ext/gettext/php3_gettext.h b/ext/gettext/php3_gettext.h
index b3ae0131d5..87e6ae4b6e 100644
--- a/ext/gettext/php3_gettext.h
+++ b/ext/gettext/php3_gettext.h
@@ -38,7 +38,7 @@
 #endif
 
 extern php3_module_entry php3_gettext_module_entry;
-#define php3_gettext_module_ptr &php3_gettext_module_entry
+#define gettext_module_ptr &php3_gettext_module_entry
 
 extern void php3_info_gettext(ZEND_MODULE_INFO_FUNC_ARGS);
 extern void php3_textdomain(INTERNAL_FUNCTION_PARAMETERS);
@@ -48,7 +48,9 @@ extern void php3_dcgettext(INTERNAL_FUNCTION_PARAMETERS);
 extern void php3_bindtextdomain(INTERNAL_FUNCTION_PARAMETERS);
 
 #else
-#define php3_gettext_module_ptr NULL
+#define gettext_module_ptr NULL
 #endif /* HAVE_LIBINTL */
 
+#define phpext_gettext_ptr gettext_module_ptr
+
 #endif /* _GETTEXT_H */
diff --git a/ext/mcrypt/config.m4 b/ext/mcrypt/config.m4
index b1ff3d465a..1b20490d89 100644
--- a/ext/mcrypt/config.m4
+++ b/ext/mcrypt/config.m4
@@ -14,8 +14,7 @@ AC_ARG_WITH(mcrypt,
       fi
     done
     if test "$MCRYPT_DIR" = ""; then
-      AC_MSG_ERROR(Please install mcrypt.h and libmcrypt.a accordingly to the do
-cumentation - I cannot find mcrypt.h)
+      AC_MSG_ERROR(Please reinstall libmcrypt - I cannot find mcrypt.h)
     fi
     INCLUDES="$INCLUDES -I$MCRYPT_DIR/include"
     EXTRA_LIBS="$EXTRA_LIBS -L$MCRYPT_DIR/lib -lmcrypt"
diff --git a/ext/mcrypt/mcrypt.c b/ext/mcrypt/mcrypt.c
index 6548ea2c16..a29e655499 100644
--- a/ext/mcrypt/mcrypt.c
+++ b/ext/mcrypt/mcrypt.c
@@ -34,8 +34,8 @@
 #include "php_mcrypt.h"
 #include "fcntl.h"
 
-/* we should find a way to figure out whether RC6/IDEA are available */
 #define NON_FREE
+#define MCRYPT2
 #include "mcrypt.h"
 
 function_entry mcrypt_functions[] = {
@@ -138,8 +138,10 @@ static int php_minit_mcrypt(INIT_FUNC_ARGS)
 	MCRYPT_ENTRY(TripleDES);
 	MCRYPT_ENTRY(ThreeWAY);
 	MCRYPT_ENTRY(GOST);
-#ifdef MCRYPT2
+#ifdef CRYPT
 	MCRYPT_ENTRY(CRYPT);
+#endif
+#ifdef DES_COMPAT
 	MCRYPT_ENTRY(DES_COMPAT);
 #endif
 	MCRYPT_ENTRY(SAFER64);
diff --git a/ext/mhash/mhash.c b/ext/mhash/mhash.c
index 39788a2400..6d031a694f 100644
--- a/ext/mhash/mhash.c
+++ b/ext/mhash/mhash.c
@@ -62,6 +62,12 @@ static int php_minit_mhash(INIT_FUNC_ARGS)
 	MHASH_ENTRY(CRC32);
 	MHASH_ENTRY(MD5);
 	MHASH_ENTRY(SHA1);
+	MHASH_ENTRY(HAVAL);
+	MHASH_ENTRY(RIPEMD128);
+	MHASH_ENTRY(RIPEMD160);
+	MHASH_ENTRY(TIGER);
+	MHASH_ENTRY(SNEFRU);
+	MHASH_ENTRY(GOST);
 	
 	return SUCCESS;
 }
diff --git a/ext/sysvsem/php3_sysvsem.h b/ext/sysvsem/php3_sysvsem.h
index fcb971dc96..c5008a6a38 100644
--- a/ext/sysvsem/php3_sysvsem.h
+++ b/ext/sysvsem/php3_sysvsem.h
@@ -71,4 +71,6 @@ extern sysvsem_module php3_sysvsem_module;
 
 #endif
 
+#define phpext_sysvsem_ptr sysvsem_module_ptr
+
 #endif /* _PHP3_SYSVSEM_H */
diff --git a/ext/sysvsem/sysvsem.c b/ext/sysvsem/sysvsem.c
index d143e4278a..c38d93d6c9 100644
--- a/ext/sysvsem/sysvsem.c
+++ b/ext/sysvsem/sysvsem.c
@@ -35,9 +35,7 @@
  * sas: Works for me on Linux 2.0.36 and FreeBSD 3.0-current
  */
 
-#ifndef MSVC5
-#include "php_config.h"
-#endif
+#include "php.h"
 
 #if HAVE_SYSVSEM
 
@@ -46,7 +44,6 @@
 #include <sys/sem.h>
 #include <errno.h>
 
-#include "php.h"
 #include "php3_sysvsem.h"
 
 #if !HAVE_SEMUN && defined(__GNU_LIBRARY__) && __GNU_LIBRARY__ == 6
@@ -70,7 +67,7 @@ function_entry sysvsem_functions[] = {
 	{NULL, NULL, NULL}
 };
 
-php3_module_entry sysvsem_module_entry = {
+zend_module_entry sysvsem_module_entry = {
 	"System V semaphores", sysvsem_functions, php3_minit_sysvsem, NULL, NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/sysvshm/php3_sysvshm.h b/ext/sysvshm/php3_sysvshm.h
index c47e561d2c..530bfc6af7 100644
--- a/ext/sysvshm/php3_sysvshm.h
+++ b/ext/sysvshm/php3_sysvshm.h
@@ -98,4 +98,6 @@ extern sysvshm_module php3_sysvshm_module;
 
 #endif
 
+#define phpext_sysvshm_ptr sysvshm_module_ptr
+
 #endif /* _PHP3_SYSVSHM_H */
diff --git a/ext/sysvshm/sysvshm.c b/ext/sysvshm/sysvshm.c
index 88678478c7..36a2eae1ff 100644
--- a/ext/sysvshm/sysvshm.c
+++ b/ext/sysvshm/sysvshm.c
@@ -33,17 +33,12 @@
  * It may not compile or execute correctly on other systems.
  */
 
-#ifndef MSVC5
-#include "php_config.h"
-#endif
-
+#include "php.h"
 
 #if HAVE_SYSVSHM
 
 #include <errno.h>
 
-#include "php.h"
-#include "php3_var.h"
 #include "php3_sysvshm.h"
 
 
diff --git a/ext/zlib/php3_zlib.h b/ext/zlib/php3_zlib.h
index 710c694cba..48257a35d2 100644
--- a/ext/zlib/php3_zlib.h
+++ b/ext/zlib/php3_zlib.h
@@ -36,7 +36,7 @@
 #if HAVE_ZLIB
 
 extern php3_module_entry php3_zlib_module_entry;
-#define php3_zlib_module_ptr &php3_zlib_module_entry
+#define zlib_module_ptr &php3_zlib_module_entry
 
 extern int php3_minit_zlib(INIT_FUNC_ARGS);
 extern int php3_mshutdown_zlib(SHUTDOWN_FUNC_ARGS);
@@ -57,7 +57,9 @@ extern void php3_readgzfile(INTERNAL_FUNCTION_PARAMETERS);
 extern void php3_gzfile(INTERNAL_FUNCTION_PARAMETERS);
 
 #else
-#define php3_zlib_module_ptr NULL
+#define zlib_module_ptr NULL
 #endif /* HAVE_ZLIB */
 
+#define phpext_zlib_ptr zlib_module_ptr
+
 #endif /* _PHP3_ZLIB_H */