- Oops I commited a name change for consistency of Zend/modules.h to

  Zend/zend_modules.h before it being finished. Revert it

diff --git a/ext/cybercash/cybercash.h b/ext/cybercash/cybercash.h
index bbac201d8d999f35ea48246750ea7d7d1194d807..27bba3edd165d95a9be31c37f026777c5d569d83 100644 (file)
--- a/ext/cybercash/cybercash.h
+++ b/ext/cybercash/cybercash.h
@@ -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
 

diff --git a/ext/gettext/php_gettext.h b/ext/gettext/php_gettext.h
index 800db286027eb0d68380320c24f0bc23f775ef87..a6f156a0a884e8f6348ebff11388638e09f4b073 100644 (file)
--- a/ext/gettext/php_gettext.h
+++ b/ext/gettext/php_gettext.h
@@ -34,7 +34,7 @@
 
 #if HAVE_LIBINTL
 #ifndef INIT_FUNC_ARGS
-#include "zend_modules.h"
+#include "modules.h"
 #endif
 
 extern zend_module_entry php_gettext_module_entry;

diff --git a/ext/icap/php_icap.c b/ext/icap/php_icap.c
index 8de4171774f5bbc12a853bd7338c0b93c766da91..74d86a4be00632b090109609537141bb11f2d4e8 100644 (file)
--- a/ext/icap/php_icap.c
+++ b/ext/icap/php_icap.c
@@ -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

diff --git a/ext/imap/imap.c b/ext/imap/imap.c
index 09637a06831ee446d92c8d39370e3ad172cad2f1..352a68469d9e7f9770b8c279961ba4c8b07fa67d 100644 (file)
--- a/ext/imap/imap.c
+++ b/ext/imap/imap.c
@@ -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;

diff --git a/ext/mcal/php_mcal.c b/ext/mcal/php_mcal.c
index 32ee72cad70fea3d00e357337409bc33ca40647f..d7cfdfa47bb7bfac63ef98a4558211c5db2529c8 100644 (file)
--- a/ext/mcal/php_mcal.c
+++ b/ext/mcal/php_mcal.c
@@ -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();

diff --git a/ext/mcrypt/php_mcrypt.h b/ext/mcrypt/php_mcrypt.h
index ebbd57645d34554d295cdfac0938fe765ab442c3..87585ae2cc8fa35508f397a625d58b62db31f3be 100644 (file)
--- a/ext/mcrypt/php_mcrypt.h
+++ b/ext/mcrypt/php_mcrypt.h
@@ -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
 

diff --git a/ext/mhash/php_mhash.h b/ext/mhash/php_mhash.h
index 58080fe1b28b854ff1c115312e8a9fb701aa2973..60f3955c18b78099fd03705c96d5a4ee79e6486d 100644 (file)
--- a/ext/mhash/php_mhash.h
+++ b/ext/mhash/php_mhash.h
@@ -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