mike Tue May 29 12:28:57 2007 UTC
Modified files:
/php-src/ext/mhash config.m4 mhash.c
Log:
- fix build where mhash.h is not declaring
mhash_get_hash_name_static and/or
mhash_get_keygen_name_static protos
http://cvs.php.net/viewvc.cgi/php-src/ext/mhash/config.m4?r1=1.16&r2=1.17&diff_format=u
Index: php-src/ext/mhash/config.m4
diff -u php-src/ext/mhash/config.m4:1.16 php-src/ext/mhash/config.m4:1.17
--- php-src/ext/mhash/config.m4:1.16 Sat Dec 23 18:00:49 2006
+++ php-src/ext/mhash/config.m4 Tue May 29 12:28:57 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.16 2006/12/23 18:00:49 derick Exp $
+dnl $Id: config.m4,v 1.17 2007/05/29 12:28:57 mike Exp $
dnl
PHP_ARG_WITH(mhash, for mhash support,
@@ -13,6 +13,20 @@
if test -z "$MHASH_DIR"; then
AC_MSG_ERROR(Please reinstall libmhash - I cannot find mhash.h)
fi
+
+ PHP_MHASH_MISSING_PROTOS=
+ AC_MSG_CHECKING(for missing protos)
+ AC_EGREP_HEADER(mhash_get_hash_name_static, [$MHASH_DIR/include/mhash.h], [
+ AC_DEFINE([HAVE_MHASH_GET_HASH_NAME_STATIC_PROTO], 1, [ ])
+ ], [
+ PHP_MHASH_MISSING_PROTOS="mhash_get_hash_name_static"
+ ])
+ AC_EGREP_HEADER(mhash_get_keygen_name_static, [$MHASH_DIR/include/mhash.h], [
+ AC_DEFINE([HAVE_MHASH_GET_KEYGEN_NAME_STATIC_PROTO], 1, [ ])
+ ], [
+ PHP_MHASH_MISSING_PROTOS="mhash_get_keygen_name_static
$PHP_MHASH_MISSING_PROTOS"
+ ])
+ AC_MSG_RESULT([$PHP_MHASH_MISSING_PROTOS])
PHP_ADD_INCLUDE($MHASH_DIR/include)
PHP_ADD_LIBRARY_WITH_PATH(mhash, $MHASH_DIR/$PHP_LIBDIR, MHASH_SHARED_LIBADD)
http://cvs.php.net/viewvc.cgi/php-src/ext/mhash/mhash.c?r1=1.57&r2=1.58&diff_format=u
Index: php-src/ext/mhash/mhash.c
diff -u php-src/ext/mhash/mhash.c:1.57 php-src/ext/mhash/mhash.c:1.58
--- php-src/ext/mhash/mhash.c:1.57 Mon Jan 1 09:29:25 2007
+++ php-src/ext/mhash/mhash.c Tue May 29 12:28:57 2007
@@ -16,7 +16,7 @@
| Nikos Mavroyanopoulos <[EMAIL PROTECTED]> (HMAC, KEYGEN) |
+----------------------------------------------------------------------+
*/
-/* $Id: mhash.c,v 1.57 2007/01/01 09:29:25 sebastian Exp $ */
+/* $Id: mhash.c,v 1.58 2007/05/29 12:28:57 mike Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -65,8 +65,12 @@
#define NO_ARGS() (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
""))
+#ifndef HAVE_MHASH_GET_HASH_NAME_STATIC_PROTO
extern const char *mhash_get_hash_name_static(hashid hash);
+#endif
+#ifndef HAVE_MHASH_GET_KEYGEN_NAME_STATIC_PROTO
extern const char *mhash_get_keygen_name_static(hashid type);
+#endif
/* {{{ int php_mhash */
int php_mhash(hashid hash, const char *input_str, int input_len, const char
*key_str, int key_len, char **enc, int *len TSRMLS_DC)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
