summaryrefslogtreecommitdiff
path: root/ext/ftp
diff options
context:
space:
mode:
authorZeev Suraski <zeev@php.net>1999-12-17 20:55:31 +0000
committerZeev Suraski <zeev@php.net>1999-12-17 20:55:31 +0000
commitfb1c77bd4f8a636ba47d720f8ca65fc6baae836d (patch)
tree1be0390e76d422f7abc36f577178f9683536fa84 /ext/ftp
parent71dddd7db7e768ae8145e085fcbb6b6db4a1c40a (diff)
downloadphp-git-fb1c77bd4f8a636ba47d720f8ca65fc6baae836d.tar.gz
- Made PHP_VERSION and PHP_OS work again
- More php3_ cleanup @- Restored the PHP_VERSION and PHP_OS constants (Zeev)
Diffstat (limited to 'ext/ftp')
-rw-r--r--ext/ftp/php_ftp.c4
-rw-r--r--ext/ftp/php_ftp.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/ftp/php_ftp.c b/ext/ftp/php_ftp.c
index 53336af627..1b86f1f4cf 100644
--- a/ext/ftp/php_ftp.c
+++ b/ext/ftp/php_ftp.c
@@ -37,7 +37,7 @@
#ifndef ZEND_VERSION
#include "internal_functions.h"
#include "php3_list.h"
-#define php_error php3_error
+#define php_error php_error
#endif
#include "ext/standard/file.h"
@@ -72,7 +72,7 @@ function_entry php3_ftp_functions[] = {
{NULL, NULL, NULL}
};
-php3_module_entry php3_ftp_module_entry = {
+zend_module_entry php3_ftp_module_entry = {
"FTP Functions",
php3_ftp_functions,
#ifdef ZEND_VERSION
diff --git a/ext/ftp/php_ftp.h b/ext/ftp/php_ftp.h
index 7da896cc8d..fa978c4531 100644
--- a/ext/ftp/php_ftp.h
+++ b/ext/ftp/php_ftp.h
@@ -40,7 +40,7 @@
#if HAVE_FTP
-extern php3_module_entry php3_ftp_module_entry;
+extern zend_module_entry php3_ftp_module_entry;
#define php3_ftp_module_ptr &php3_ftp_module_entry
#ifdef ZEND_VERSION