From: Andi Gutmans <andi@php.net>
Date: Sat, 11 Mar 2000 20:57:35 +0000 (+0000)
Subject: - Oops I commited a name change for consistency of Zend/modules.h to
X-Git-Tag: PHP-4.0-RC1~182
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=649d8721dbddc225a0330a0d9ed7750287dbcd18;p=php

- 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 bbac201d8d..27bba3edd1 100644
--- 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 800db28602..a6f156a0a8 100644
--- 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 8de4171774..74d86a4be0 100644
--- 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 09637a0683..352a68469d 100644
--- 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 32ee72cad7..d7cfdfa47b 100644
--- 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 ebbd57645d..87585ae2cc 100644
--- 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 58080fe1b2..60f3955c18 100644
--- 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