summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Zmievski <andrei@php.net>2000-07-18 19:13:14 +0000
committerAndrei Zmievski <andrei@php.net>2000-07-18 19:13:14 +0000
commit7edad11a74546e35c35b1ceb1668dc57cff71351 (patch)
tree8bb246ee0be3fceaebf66c9c6efd62365b36a98b
parent9d8b0f805bab2145410326e4340b25edca4ac0e5 (diff)
downloadphp-git-7edad11a74546e35c35b1ceb1668dc57cff71351.tar.gz
Fixed compilation errors.
-rw-r--r--ext/cybercash/cybercash.c7
-rw-r--r--ext/cybercash/cybercash.h6
2 files changed, 4 insertions, 9 deletions
diff --git a/ext/cybercash/cybercash.c b/ext/cybercash/cybercash.c
index f1e43092a4..28b4f921ae 100644
--- a/ext/cybercash/cybercash.c
+++ b/ext/cybercash/cybercash.c
@@ -29,9 +29,10 @@
*/
#include "php.h"
+#include "ext/standard/info.h"
+#include "cybercash.h"
#if HAVE_MCK
-#include "cybercash.h"
#include "mckcrypt.h"
#include "base64.h"
@@ -137,14 +138,14 @@ PHP_FUNCTION(cybercash_decr)
errcode = mck_decr(Z_STRVAL_PP(wmk),
Z_STRVAL_PP(sk),
Z_STRLEN_PP(inbuff),
- Z_STRLEN_PP(inbuff),
+ Z_STRVAL_PP(inbuff),
outAlloc,
outbuff,
&outLth,
macbuff);
if (array_init(return_value) == FAILURE) {
- php_error(E_WARNING, "Could not initialize Return value from cybercash_decr")
+ php_error(E_WARNING, "Could not initialize Return value from cybercash_decr");
RETURN_FALSE;
}
diff --git a/ext/cybercash/cybercash.h b/ext/cybercash/cybercash.h
index c910e846f4..fc6de8761e 100644
--- a/ext/cybercash/cybercash.h
+++ b/ext/cybercash/cybercash.h
@@ -33,12 +33,6 @@
#if HAVE_MCK
-#if PHP_API_VERSION < 19990421
-#define zend_module_entry cybercash_module_entry
-#include "modules.h"
-#include "internal_functions.h"
-#endif
-
extern zend_module_entry cybercash_module_entry;
#define cybercash_module_ptr &cybercash_module_entry