cvs: /php4/ext/cybercash cybercash.h /php4/ext/gettext php_gettext.h /php4/ext/icap php_icap.c /php4/ext/imap imap.c /php4/ext/mcal php_mcal.c
/php4/ext/mcrypt php_mcrypt.h /php4/ext/mhash php_mhash.h

andi Sat Mar 11 12:57:36 2000 EDT Modified files: /php4/ext/cybercash cybercash.h /php4/ext/gettext php_gettext.h /php4/ext/icap php_icap.c /php4/ext/imap imap.c /php4/ext/mcal php_mcal.c /php4/ext/mcrypt php_mcrypt.h /php4/ext/mhash php_mhash.h Log: - Oops I commited a name change for consistency of Zend/modules.h to Zend/zend_modules.h before it being finished. Revert it Index: php4/ext/cybercash/cybercash.h diff -u php4/ext/cybercash/cybercash.h:1.2 php4/ext/cybercash/cybercash.h:1.3 --- php4/ext/cybercash/cybercash.h:1.2 Sat Mar 11 12:48:44 2000 +++ php4/ext/cybercash/cybercash.h Sat Mar 11 12:57:33 2000 @@ -35,7 +35,7 @@ #if PHP_API_VERSION < 19990421 #define zend_module_entry cybercash_module_entry -#include "zend_modules.h" +#include "modules.h" #include "internal_functions.h" #endif Index: php4/ext/gettext/php_gettext.h diff -u php4/ext/gettext/php_gettext.h:1.4 php4/ext/gettext/php_gettext.h:1.5 --- php4/ext/gettext/php_gettext.h:1.4 Sat Mar 11 12:48:45 2000 +++ php4/ext/gettext/php_gettext.h Sat Mar 11 12:57:33 2000 @@ -27,14 +27,14 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_gettext.h,v 1.4 2000/03/11 20:48:45 andi Exp $ */ +/* $Id: php_gettext.h,v 1.5 2000/03/11 20:57:33 andi Exp $ */ #ifndef _GETTEXT_H #define _GETTEXT_H #if HAVE_LIBINTL #ifndef INIT_FUNC_ARGS -#include "zend_modules.h" +#include "modules.h" #endif extern zend_module_entry php_gettext_module_entry; Index: php4/ext/icap/php_icap.c diff -u php4/ext/icap/php_icap.c:1.5 php4/ext/icap/php_icap.c:1.6 --- php4/ext/icap/php_icap.c:1.5 Sat Mar 11 12:48:46 2000 +++ php4/ext/icap/php_icap.c Sat Mar 11 12:57:33 2000 @@ -49,7 +49,7 @@ #include <stdarg.h> #include "cal.h" #include "php_icap.h" -#include "zend_modules.h" +#include "modules.h" #if (WIN32|WINNT) #include "winsock.h" #endif Index: php4/ext/imap/imap.c diff -u php4/ext/imap/imap.c:1.50 php4/ext/imap/imap.c:1.51 --- php4/ext/imap/imap.c:1.50 Sat Mar 11 12:48:46 2000 +++ php4/ext/imap/imap.c Sat Mar 11 12:57:34 2000 @@ -22,7 +22,7 @@ | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: imap.c,v 1.50 2000/03/11 20:48:46 andi Exp $ */ +/* $Id: imap.c,v 1.51 2000/03/11 20:57:34 andi Exp $ */ #define IMAP41 @@ -46,7 +46,7 @@ #include "imap.h" #include "mail.h" #include "rfc822.h" -#include "zend_modules.h" +#include "modules.h" #if (WIN32|WINNT) #include "winsock.h" MAILSTREAM DEFAULTPROTO; Index: php4/ext/mcal/php_mcal.c diff -u php4/ext/mcal/php_mcal.c:1.14 php4/ext/mcal/php_mcal.c:1.15 --- php4/ext/mcal/php_mcal.c:1.14 Sat Mar 11 12:48:47 2000 +++ php4/ext/mcal/php_mcal.c Sat Mar 11 12:57:34 2000 @@ -49,8 +49,8 @@ #include <stdarg.h> #include "mcal.h" #include "php_mcal.h" -#include "zend_modules.h" -#if (WIN32|WINNT) +#include "modules.h" +#ifdef PHP_WIN32 #include "winsock.h" #endif CALSTREAM *cal_open(); Index: php4/ext/mcrypt/php_mcrypt.h diff -u php4/ext/mcrypt/php_mcrypt.h:1.12 php4/ext/mcrypt/php_mcrypt.h:1.13 --- php4/ext/mcrypt/php_mcrypt.h:1.12 Sat Mar 11 12:48:48 2000 +++ php4/ext/mcrypt/php_mcrypt.h Sat Mar 11 12:57:34 2000 @@ -5,7 +5,7 @@ #if PHP_API_VERSION < 19990421 #define zend_module_entry zend_module_entry -#include "zend_modules.h" +#include "modules.h" #include "internal_functions.h" #endif Index: php4/ext/mhash/php_mhash.h diff -u php4/ext/mhash/php_mhash.h:1.4 php4/ext/mhash/php_mhash.h:1.5 --- php4/ext/mhash/php_mhash.h:1.4 Sat Mar 11 12:48:49 2000 +++ php4/ext/mhash/php_mhash.h Sat Mar 11 12:57:35 2000 @@ -5,7 +5,7 @@ #if PHP_API_VERSION < 19990421 #define zend_module_entry zend_module_entry -#include "zend_modules.h" +#include "modules.h" #include "internal_functions.h" #endif