From 502bb9c746e3d07cf8c5faa18b38497a0a6773bc Mon Sep 17 00:00:00 2001
From: Zeev Suraski <zeev@php.net>
Date: Fri, 17 Dec 1999 21:34:28 +0000
Subject: More php3 cleanup

---
 ext/ftp/php_ftp.c | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

(limited to 'ext/ftp/php_ftp.c')

diff --git a/ext/ftp/php_ftp.c b/ext/ftp/php_ftp.c
index 1b86f1f4cf..f96cc21a3c 100644
--- a/ext/ftp/php_ftp.c
+++ b/ext/ftp/php_ftp.c
@@ -34,12 +34,6 @@
 
 #if HAVE_FTP
 
-#ifndef ZEND_VERSION
-#include "internal_functions.h"
-#include "php3_list.h"
-#define php_error php_error
-#endif
-
 #include "ext/standard/file.h"
 
 #include "php_ftp.h"
@@ -48,7 +42,7 @@
 static int	le_ftpbuf;
 
 
-function_entry php3_ftp_functions[] = {
+function_entry php_ftp_functions[] = {
 	PHP_FE(ftp_connect,			NULL)
 	PHP_FE(ftp_login,			NULL)
 	PHP_FE(ftp_pwd,				NULL)
@@ -72,14 +66,10 @@ function_entry php3_ftp_functions[] = {
 	{NULL, NULL, NULL}
 };
 
-zend_module_entry php3_ftp_module_entry = {
+zend_module_entry php_ftp_module_entry = {
 	"FTP Functions",
-	php3_ftp_functions,
-#ifdef ZEND_VERSION
+	php_ftp_functions,
 	PHP_MINIT(ftp),
-#else
-	php3_minit_ftp,
-#endif
 	NULL,
 	NULL,
 	NULL,
@@ -92,11 +82,7 @@ static void ftp_destructor_ftpbuf(ftpbuf_t *ftp)
 	ftp_close(ftp);
 }
 
-#ifndef ZEND_VERSION
-int php3_minit_ftp(INIT_FUNC_ARGS)
-#else
 PHP_MINIT_FUNCTION(ftp)
-#endif
 {
 
 	ELS_FETCH();
-- 
cgit v1.2.1