- Made PHP_VERSION and PHP_OS work again

- More php3_ cleanup
@- Restored the PHP_VERSION and PHP_OS constants (Zeev)

28 files changed, 67 insertions, 67 deletions

diff --git a/ext/standard/base64.c b/ext/standard/base64.c
index 3f676ba8b9..9f95520703 100644
--- a/ext/standard/base64.c
+++ b/ext/standard/base64.c
@@ -68,7 +68,7 @@ unsigned char *php_base64_encode(const unsigned char *string, int length, int *r
 }
 
 /* as above, but backwards. :) */
-unsigned char *_php3_base64_decode(const unsigned char *string, int length, int *ret_length) {
+unsigned char *php_base64_decode(const unsigned char *string, int length, int *ret_length) {
 	const unsigned char *current = string;
 	int ch, i = 0, j = 0, k;
 	/* this sucks for threaded environments */
@@ -173,7 +173,7 @@ PHP_FUNCTION(base64_decode) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(string);
-	result = _php3_base64_decode((*string)->value.str.val, (*string)->value.str.len, &ret_length);
+	result = php_base64_decode((*string)->value.str.val, (*string)->value.str.len, &ret_length);
 	if (result != NULL) {
 		return_value->value.str.val = result;
 		return_value->value.str.len = ret_length;
diff --git a/ext/standard/base64.h b/ext/standard/base64.h
index 23d9ffd591..0352b4ab36 100644
--- a/ext/standard/base64.h
+++ b/ext/standard/base64.h
@@ -35,7 +35,7 @@ PHP_FUNCTION(base64_decode);
 PHP_FUNCTION(base64_encode);
 
 extern unsigned char *php_base64_encode(const unsigned char *, int, int *);
-extern unsigned char *_php3_base64_decode(const unsigned char *, int, int *);
+extern unsigned char *php_base64_decode(const unsigned char *, int, int *);
 
 #endif /* _BASE64_h */
 
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 77264d4911..2a349b75fe 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -323,7 +323,7 @@ PHP_INI_BEGIN()
 PHP_INI_END()
 
 
-php3_module_entry basic_functions_module = {
+zend_module_entry basic_functions_module = {
 	"Basic Functions",			/* extension name */
 	basic_functions,			/* function list */
 	PHP_MINIT(basic),			/* process startup */
@@ -810,7 +810,7 @@ PHP_FUNCTION(get_magic_quotes_gpc)
 }
 
 
-void php3_is_type(INTERNAL_FUNCTION_PARAMETERS,int type)
+void php_is_type(INTERNAL_FUNCTION_PARAMETERS,int type)
 {
 	pval **arg;
 	
@@ -827,37 +827,37 @@ void php3_is_type(INTERNAL_FUNCTION_PARAMETERS,int type)
 
 PHP_FUNCTION(is_resource) 
 {
-	php3_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_RESOURCE);
+	php_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_RESOURCE);
 }
 
 PHP_FUNCTION(is_bool) 
 {
-	php3_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_BOOL);
+	php_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_BOOL);
 }
 
 PHP_FUNCTION(is_long) 
 {
-	php3_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_LONG);
+	php_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_LONG);
 }
 
 PHP_FUNCTION(is_double)
 {
-	php3_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_DOUBLE);
+	php_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_DOUBLE);
 }
 
 PHP_FUNCTION(is_string)
 { 
-	php3_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_STRING);
+	php_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_STRING);
 }
 
 PHP_FUNCTION(is_array)
 {
-	php3_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_ARRAY);
+	php_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_ARRAY);
 }
 
 PHP_FUNCTION(is_object)
 {
-	php3_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_OBJECT);
+	php_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_OBJECT);
 }
 
 
diff --git a/ext/standard/basic_functions.h b/ext/standard/basic_functions.h
index cde57adcb7..174c64c6ea 100644
--- a/ext/standard/basic_functions.h
+++ b/ext/standard/basic_functions.h
@@ -38,7 +38,7 @@
 
 #include "zend_highlight.h"
 
-extern php3_module_entry basic_functions_module;
+extern zend_module_entry basic_functions_module;
 #define basic_functions_module_ptr &basic_functions_module
 
 PHP_MINIT_FUNCTION(basic);
@@ -68,7 +68,7 @@ PHP_FUNCTION(set_magic_quotes_runtime);
 PHP_FUNCTION(get_magic_quotes_runtime);
 PHP_FUNCTION(get_magic_quotes_gpc);
 
-void php3_is_type(INTERNAL_FUNCTION_PARAMETERS, int type);
+void php_is_type(INTERNAL_FUNCTION_PARAMETERS, int type);
 PHP_FUNCTION(is_resource);
 PHP_FUNCTION(is_bool);
 PHP_FUNCTION(is_long);
diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c
index 55dc0f049e..e5037f9b9e 100644
--- a/ext/standard/browscap.c
+++ b/ext/standard/browscap.c
@@ -33,7 +33,7 @@ function_entry browscap_functions[] = {
 	{NULL, NULL, NULL}
 };
 
-php3_module_entry browscap_module_entry = {
+zend_module_entry browscap_module_entry = {
 	"browscap", browscap_functions, PHP_MINIT(browscap), PHP_MSHUTDOWN(browscap),
 	NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES
 };
diff --git a/ext/standard/crypt.c b/ext/standard/crypt.c
index 48619c5a67..11383cc243 100644
--- a/ext/standard/crypt.c
+++ b/ext/standard/crypt.c
@@ -53,7 +53,7 @@ function_entry crypt_functions[] = {
 	{NULL, NULL, NULL}
 };
 
-php3_module_entry crypt_module_entry = {
+zend_module_entry crypt_module_entry = {
 	"Crypt", crypt_functions, PHP_MINIT(crypt), NULL, NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/standard/dir.c b/ext/standard/dir.c
index 9239ea33c6..a69da0c957 100644
--- a/ext/standard/dir.c
+++ b/ext/standard/dir.c
@@ -102,7 +102,7 @@ static zend_function_entry php_dir_class_functions[] = {
 };
 
 
-php3_module_entry php3_dir_module_entry = {
+zend_module_entry php3_dir_module_entry = {
 	"PHP_dir", php_dir_functions, PHP_MINIT(dir), NULL, NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/standard/dl.c b/ext/standard/dl.c
index e113249fd1..7e0e4e1f40 100644
--- a/ext/standard/dl.c
+++ b/ext/standard/dl.c
@@ -46,7 +46,7 @@ function_entry dl_functions[] = {
 };
 
 
-php3_module_entry dl_module_entry = {
+zend_module_entry dl_module_entry = {
 	"PHP_DL", dl_functions, NULL, NULL, NULL, NULL, PHP_MINFO(dl), STANDARD_MODULE_PROPERTIES
 };
 
@@ -84,8 +84,8 @@ void php_dl(pval *file,int type,pval *return_value)
 {
 	void *handle;
 	char libpath[MAXPATHLEN + 1];
-	php3_module_entry *module_entry,*tmp;
-	php3_module_entry *(*get_module)(void);
+	zend_module_entry *module_entry,*tmp;
+	zend_module_entry *(*get_module)(void);
 	PLS_FETCH();
 	
 	if (cfg_get_string("extension_dir",&PG(extension_dir))==SUCCESS
@@ -119,7 +119,7 @@ void php_dl(pval *file,int type,pval *return_value)
 #endif
 		RETURN_FALSE;
 	}
-	get_module = (php3_module_entry *(*)(void)) dlsym(handle, "get_module");
+	get_module = (zend_module_entry *(*)(void)) dlsym(handle, "get_module");
 	
 	if (!get_module) {
 		dlclose(handle);
diff --git a/ext/standard/dl.h b/ext/standard/dl.h
index 6bf453d23e..399aa0bc51 100644
--- a/ext/standard/dl.h
+++ b/ext/standard/dl.h
@@ -40,7 +40,7 @@ void php_dl(pval *file,int type,pval *return_value);
 
 #ifdef HAVE_LIBDL
 
-extern php3_module_entry dl_module_entry;
+extern zend_module_entry dl_module_entry;
 #define dl_module_ptr &dl_module_entry
 
 /* dynamic loading functions */
diff --git a/ext/standard/file.c b/ext/standard/file.c
index d8a312d4ce..606d347b84 100644
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -865,7 +865,7 @@ PHP_FUNCTION(set_socket_blocking)
 	if (_php3_set_sock_blocking(socketd, block) == FAILURE)
 		RETURN_FALSE;
 
-	_php3_sock_set_blocking(socketd, block == 0 ? 0 : 1);
+	php_sockset_blocking(socketd, block == 0 ? 0 : 1);
 	
 	RETURN_TRUE;
 }
diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c
index 4a33ea7ff5..0d904e38f3 100644
--- a/ext/standard/filestat.c
+++ b/ext/standard/filestat.c
@@ -173,7 +173,7 @@ PHP_FUNCTION(diskfreespace)
 		}
 	}
 	else {
-		php3_error(E_WARNING, "Unable to load kernel32.dll");
+		php_error(E_WARNING, "Unable to load kernel32.dll");
 		RETURN_FALSE;
 	}
 
@@ -591,7 +591,7 @@ function_entry php3_filestat_functions[] = {
 };
 
 
-php3_module_entry php3_filestat_module_entry = {
+zend_module_entry php3_filestat_module_entry = {
 	"PHP_filestat", php3_filestat_functions, NULL, NULL, PHP_RINIT(filestat),
 					PHP_RSHUTDOWN(filestat), NULL, STANDARD_MODULE_PROPERTIES
 };
diff --git a/ext/standard/formatted_print.c b/ext/standard/formatted_print.c
index ffd53e3aca..f6b9600a1e 100644
--- a/ext/standard/formatted_print.c
+++ b/ext/standard/formatted_print.c
@@ -365,7 +365,7 @@ php_sprintf_getnumber(char *buffer, int *pos)
  *
  */
 static char *
-php3_formatted_print(int ht, int *len)
+php_formatted_print(int ht, int *len)
 {
 	pval ***args;
 	int argc, size = 240, inpos = 0, outpos = 0;
@@ -561,7 +561,7 @@ PHP_FUNCTION(user_sprintf)
 	char *result;
 	int len;
 	
-	if ((result=php3_formatted_print(ht,&len))==NULL) {
+	if ((result=php_formatted_print(ht,&len))==NULL) {
 		RETURN_FALSE;
 	}
 	RETVAL_STRINGL(result,len,1);
@@ -576,7 +576,7 @@ PHP_FUNCTION(user_printf)
 	char *result;
 	int len;
 	
-	if ((result=php3_formatted_print(ht,&len))==NULL) {
+	if ((result=php_formatted_print(ht,&len))==NULL) {
 		RETURN_FALSE;
 	}
 	PHPWRITE(result,len);
diff --git a/ext/standard/fsock.c b/ext/standard/fsock.c
index 0cfdcc4947..2c68448bb0 100644
--- a/ext/standard/fsock.c
+++ b/ext/standard/fsock.c
@@ -111,7 +111,7 @@ struct php3i_sockbuf {
 
 typedef struct php3i_sockbuf php3i_sockbuf;
 
-php3_module_entry fsock_module_entry = {
+zend_module_entry fsock_module_entry = {
 	"Socket functions",
 	fsock_functions,
 	PHP_MINIT(fsock),
@@ -411,10 +411,10 @@ static void php_cleanup_sockbuf(int persistent FLS_DC)
 #define SOCK_FIND(sock,socket) \
       php3i_sockbuf *sock; \
       FLS_FETCH(); \
-      sock = _php3_sock_find(socket FLS_CC); \
-      if(!sock) sock = _php3_sock_create(socket FLS_CC)
+      sock = php_sockfind(socket FLS_CC); \
+      if(!sock) sock = php_sockcreate(socket FLS_CC)
 
-static php3i_sockbuf *_php3_sock_find(int socket FLS_DC)
+static php3i_sockbuf *php_sockfind(int socket FLS_DC)
 {
 	php3i_sockbuf *buf = NULL, *tmp;
 
@@ -427,7 +427,7 @@ static php3i_sockbuf *_php3_sock_find(int socket FLS_DC)
 	return buf;
 }
 
-static php3i_sockbuf *_php3_sock_create(int socket FLS_DC)
+static php3i_sockbuf *php_sockcreate(int socket FLS_DC)
 {
 	php3i_sockbuf *sock;
 	int persistent = _php3_is_persistent_sock(socket);
@@ -457,13 +457,13 @@ size_t php_sock_set_def_chunk_size(size_t size)
 	return old;
 }
 
-int _php3_sock_destroy(int socket)
+int php_sockdestroy(int socket)
 {
 	int ret = 0;
 	php3i_sockbuf *sock;
 	FLS_FETCH();
 
-	sock = _php3_sock_find(socket FLS_CC);
+	sock = php_sockfind(socket FLS_CC);
 	if(sock) {
 		ret = 1;
 		SOCK_DESTROY(sock);
@@ -490,7 +490,7 @@ int php_sock_close(int socket)
 	php3i_sockbuf *sock;
 	FLS_FETCH();
 
-	sock = _php3_sock_find(socket FLS_CC);
+	sock = php_sockfind(socket FLS_CC);
 	if(sock) {
 		if(!sock->persistent) {
 			SOCK_CLOSE(sock->socket);
@@ -505,7 +505,7 @@ int php_sock_close(int socket)
 
 #define MAX_CHUNKS_PER_READ 10
 
-static void _php3_sock_wait_for_data(php3i_sockbuf *sock)
+static void php_sockwait_for_data(php3i_sockbuf *sock)
 {
 	fd_set fdr, tfdr;
 
@@ -519,7 +519,7 @@ static void _php3_sock_wait_for_data(php3i_sockbuf *sock)
 	}
 }
 
-static size_t _php3_sock_read_internal(php3i_sockbuf *sock)
+static size_t php_sockread_internal(php3i_sockbuf *sock)
 {
 	char buf[CHUNK_SIZE];
 	int nr_bytes;
@@ -534,7 +534,7 @@ static size_t _php3_sock_read_internal(php3i_sockbuf *sock)
 
 	
 	if(sock->is_blocked) {
-		_php3_sock_wait_for_data(sock);
+		php_sockwait_for_data(sock);
 	}
 
 	/* read at a maximum sock->chunk_size */
@@ -555,21 +555,21 @@ static size_t _php3_sock_read_internal(php3i_sockbuf *sock)
 	return nr_read;
 }
 
-static void _php3_sock_read_total(php3i_sockbuf *sock, size_t maxread)
+static void php_sockread_total(php3i_sockbuf *sock, size_t maxread)
 {
 	while(!sock->eof && TOREAD(sock) < maxread) {
-		_php3_sock_read_internal(sock);
+		php_sockread_internal(sock);
 	}
 }
 
-static size_t _php3_sock_read(php3i_sockbuf *sock)
+static size_t php_sockread(php3i_sockbuf *sock)
 {
 	size_t nr_bytes;
 	size_t nr_read = 0;
 	int i;
 	
 	for(i = 0; !sock->eof && i < MAX_CHUNKS_PER_READ; i++) {
-		nr_bytes = _php3_sock_read_internal(sock);
+		nr_bytes = php_sockread_internal(sock);
 		if(nr_bytes == 0) break;
 		nr_read += nr_bytes;
 	}
@@ -577,7 +577,7 @@ static size_t _php3_sock_read(php3i_sockbuf *sock)
 	return nr_read;
 }
 
-int _php3_sock_set_blocking(int socket, int mode)
+int php_sockset_blocking(int socket, int mode)
 {
 	int old;
 	SOCK_FIND(sock, socket);
@@ -591,7 +591,7 @@ int _php3_sock_set_blocking(int socket, int mode)
 
 #define SOCK_FIND_AND_READ_MAX(max) \
 	SOCK_FIND(sock, socket); \
-	if(sock->is_blocked) _php3_sock_read_total(sock, max); else _php3_sock_read(sock)
+	if(sock->is_blocked) php_sockread_total(sock, max); else php_sockread(sock)
 
 /* {{{ php_sock_fgets() */
 /*
@@ -614,11 +614,11 @@ char *php_sock_fgets(char *buf, size_t maxlen, int socket)
 	if(!p) {
 		if(sock->is_blocked) {
 			while(!p && !sock->eof && TOREAD(sock) < maxlen) {
-				_php3_sock_read_internal(sock);
+				php_sockread_internal(sock);
 				SEARCHCR();
 			}
 		} else {
-			_php3_sock_read(sock);
+			php_sockread(sock);
 			SEARCHCR();
 		}
 	}
@@ -674,7 +674,7 @@ int php_sock_feof(int socket)
 	SOCK_FIND(sock, socket);
 
 	if(!sock->is_blocked)
-		_php3_sock_read(sock);
+		php_sockread(sock);
 	
 	if(!TOREAD(sock) && sock->eof) 
 		ret = 1;
diff --git a/ext/standard/fsock.h b/ext/standard/fsock.h
index 04108580b8..06ff385dc4 100644
--- a/ext/standard/fsock.h
+++ b/ext/standard/fsock.h
@@ -55,7 +55,7 @@
 #include <sys/time.h>
 #endif
 
-extern php3_module_entry fsock_module_entry;
+extern zend_module_entry fsock_module_entry;
 #define phpext_fsock_ptr &fsock_module_entry
 
 PHP_FUNCTION(fsockopen);
@@ -66,8 +66,8 @@ size_t php_sock_fread(char *buf, size_t maxlen, int socket);
 int php_sock_feof(int socket);
 int php_sock_fgetc(int socket);
 int _php3_is_persistent_sock(int);
-int _php3_sock_set_blocking(int socket, int mode);
-int _php3_sock_destroy(int socket);
+int php_sockset_blocking(int socket, int mode);
+int php_sockdestroy(int socket);
 int php_sock_close(int socket);
 size_t php_sock_set_def_chunk_size(size_t size);
 int php_msock_destroy(int *data);
diff --git a/ext/standard/head.c b/ext/standard/head.c
index 5bc39e5a3a..39fec956af 100644
--- a/ext/standard/head.c
+++ b/ext/standard/head.c
@@ -573,7 +573,7 @@ function_entry php_header_functions[] = {
 };
 
 
-php3_module_entry php_header_module_entry = {
+zend_module_entry php_header_module_entry = {
 	"PHP_head", php_header_functions, NULL, NULL, PHP_RINIT(head), NULL, NULL, STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/standard/head.h b/ext/standard/head.h
index df5aceb6fe..10d1a53603 100644
--- a/ext/standard/head.h
+++ b/ext/standard/head.h
@@ -49,7 +49,7 @@ typedef struct CookieList {
 	struct CookieList *next;
 } CookieList;
 
-extern php3_module_entry php_header_module_entry;
+extern zend_module_entry php_header_module_entry;
 #define php_header_module_ptr &php_header_module_entry
 
 extern PHP_RINIT_FUNCTION(head);
diff --git a/ext/standard/mail.c b/ext/standard/mail.c
index db4988a659..90e3d5696d 100644
--- a/ext/standard/mail.c
+++ b/ext/standard/mail.c
@@ -44,13 +44,13 @@ function_entry mail_functions[] = {
 	{NULL, NULL, NULL}
 };
 
-php3_module_entry mail_module_entry = {
+zend_module_entry mail_module_entry = {
 	"Sendmail", mail_functions, NULL, NULL, NULL, NULL, PHP_MINFO(mail), STANDARD_MODULE_PROPERTIES
 };
 
 
 #if COMPILE_DL
-DLEXPORT php3_module_entry *get_module(void) { return &odbc_module_entry; }
+DLEXPORT zend_module_entry *get_module(void) { return &odbc_module_entry; }
 #endif
 
 /* {{{ proto int mail(string to, string subject, string message [, string additional_headers])
diff --git a/ext/standard/output.c b/ext/standard/output.c
index 721379471b..55ecb43f33 100644
--- a/ext/standard/output.c
+++ b/ext/standard/output.c
@@ -107,7 +107,7 @@ static zend_function_entry php_output_functions[] = {
 PHP_RINIT_FUNCTION(output);
 PHP_RSHUTDOWN_FUNCTION(output);
 
-php3_module_entry output_module_entry = {
+zend_module_entry output_module_entry = {
 	"PHP_output", 
 	php_output_functions, 
 	NULL,                   /* extension-wide startup function */
diff --git a/ext/standard/pack.c b/ext/standard/pack.c
index af6ad58f5d..7d5d9be654 100644
--- a/ext/standard/pack.c
+++ b/ext/standard/pack.c
@@ -56,7 +56,7 @@ function_entry pack_functions[] = {
 	{NULL, NULL, NULL}
 };
 
-php3_module_entry pack_module_entry = {
+zend_module_entry pack_module_entry = {
 	"PHP_pack", pack_functions, PHP_MINIT(pack), NULL, NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/standard/pack.h b/ext/standard/pack.h
index bad1af9cfe..98900415bc 100644
--- a/ext/standard/pack.h
+++ b/ext/standard/pack.h
@@ -32,7 +32,7 @@
 #ifndef _PACK_H
 #define _PACK_H
 
-extern php3_module_entry pack_module_entry;
+extern zend_module_entry pack_module_entry;
 #define pack_module_ptr &pack_module_entry
 
 extern PHP_MINIT_FUNCTION(pack);
diff --git a/ext/standard/php_browscap.h b/ext/standard/php_browscap.h
index 338272692e..a3706952c0 100644
--- a/ext/standard/php_browscap.h
+++ b/ext/standard/php_browscap.h
@@ -31,7 +31,7 @@
 #ifndef _PHP_BROWSCAP_H
 #define _PHP_BROWSCAP_H
 
-extern php3_module_entry browscap_module_entry;
+extern zend_module_entry browscap_module_entry;
 #define browscap_module_ptr &browscap_module_entry
 
 extern PHP_MINIT_FUNCTION(browscap);
diff --git a/ext/standard/php_crypt.h b/ext/standard/php_crypt.h
index 1b93431cb5..94dbfb40f8 100644
--- a/ext/standard/php_crypt.h
+++ b/ext/standard/php_crypt.h
@@ -2,7 +2,7 @@
 #define PHP_CRYPT_H
 
 #if HAVE_CRYPT
-extern php3_module_entry crypt_module_entry;
+extern zend_module_entry crypt_module_entry;
 #define crypt_module_ptr &crypt_module_entry
 PHP_FUNCTION(crypt);
 extern PHP_MINIT_FUNCTION(crypt);
diff --git a/ext/standard/php_dir.h b/ext/standard/php_dir.h
index bb09e2fbdd..3b3c74fe8c 100644
--- a/ext/standard/php_dir.h
+++ b/ext/standard/php_dir.h
@@ -21,7 +21,7 @@
 
 #ifndef _PHP_DIR_H
 #define _PHP_DIR_H
-extern php3_module_entry php3_dir_module_entry;
+extern zend_module_entry php3_dir_module_entry;
 #define php3_dir_module_ptr &php3_dir_module_entry
 
 /* directory functions */
diff --git a/ext/standard/php_filestat.h b/ext/standard/php_filestat.h
index 05003fa807..33ab79a59d 100644
--- a/ext/standard/php_filestat.h
+++ b/ext/standard/php_filestat.h
@@ -61,7 +61,7 @@ PHP_FUNCTION(chmod);
 PHP_FUNCTION(touch);
 PHP_FUNCTION(clearstatcache);
 
-extern php3_module_entry php3_filestat_module_entry;
+extern zend_module_entry php3_filestat_module_entry;
 #define php3_filestat_module_ptr &php3_filestat_module_entry
 
 #define phpext_filestat_ptr php3_filestat_module_ptr
diff --git a/ext/standard/php_mail.h b/ext/standard/php_mail.h
index 918bcbdf1c..cd8ac30b5c 100644
--- a/ext/standard/php_mail.h
+++ b/ext/standard/php_mail.h
@@ -33,7 +33,7 @@
 #ifndef _MAIL_H
 #define _MAIL_H
 #if HAVE_SENDMAIL
-extern php3_module_entry mail_module_entry;
+extern zend_module_entry mail_module_entry;
 #define mail_module_ptr &mail_module_entry
 
 PHP_FUNCTION(mail);
diff --git a/ext/standard/php_syslog.h b/ext/standard/php_syslog.h
index 69dd4abb80..01a94eb6d3 100644
--- a/ext/standard/php_syslog.h
+++ b/ext/standard/php_syslog.h
@@ -32,7 +32,7 @@
 #define _PHP_SYSLOG_H
 
 #if HAVE_SYSLOG_H
-extern php3_module_entry syslog_module_entry;
+extern zend_module_entry syslog_module_entry;
 #define syslog_module_ptr &syslog_module_entry
 
 extern PHP_MINIT_FUNCTION(syslog);
diff --git a/ext/standard/reg.h b/ext/standard/reg.h
index c261abf4d2..6b03d641ee 100644
--- a/ext/standard/reg.h
+++ b/ext/standard/reg.h
@@ -33,7 +33,7 @@
 #ifndef _REG_H
 #define _REG_H
 
-extern php3_module_entry regexp_module_entry;
+extern zend_module_entry regexp_module_entry;
 #define regexp_module_ptr &regexp_module_entry
 
 char *_php3_regreplace(const char *pattern, const char *replace, const char *string, int icase, int extended);
diff --git a/ext/standard/syslog.c b/ext/standard/syslog.c
index 2154212ce7..aaec497fd9 100644
--- a/ext/standard/syslog.c
+++ b/ext/standard/syslog.c
@@ -265,13 +265,13 @@ function_entry syslog_functions[] = {
 };
 
 
-php3_module_entry syslog_module_entry = {
+zend_module_entry syslog_module_entry = {
 	"Syslog", syslog_functions, PHP_MINIT(syslog), NULL, PHP_RINIT(syslog), PHP_RSHUTDOWN(syslog), NULL, STANDARD_MODULE_PROPERTIES
 };
 
 
 #if COMPILE_DL
-DLEXPORT php3_module_entry *get_module(void) { return &syslog_module_entry; }
+DLEXPORT zend_module_entry *get_module(void) { return &syslog_module_entry; }
 #endif