Fix Win32 build

diff --git a/NEWS b/NEWS
index 0f91e1915c84aff45a40648fb5578d252936848e..4ae4cfea8e6999310375638fb472ce067ab4374b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,7 +5,9 @@ PHP 4.0                                                                    NEWS
 - Added create_function(), which gives the ability to create functions
   on-the-fly (Zeev, Zend Engine)
 - Added support for comparisons of arrays (with arrays) and objects (with
-  objects) (Zeev, Zend Engine)
+  objects);  The equality operator (==) performs an unordered comparison,
+  whereas the identity operator (===) performs an ordered comparison (Zeev,
+  Zend Engine)
 - Allow all functions that receive user-defined function callbacks to accept
   an array that contains an object and a method name, in place of a function
   name, e.g. usort($array, array($obj, "ObjSort")) (Zeev, Zend Engine)

diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c
index dc6d9081cdc8734989cae0bc0108b96be58d2c65..a4b7ed0a4d34f38be2e0213d26adfc1e7be0d81a 100644 (file)
--- a/ext/session/mod_files.c
+++ b/ext/session/mod_files.c
@@ -31,7 +31,6 @@
 #endif
 
 #ifdef PHP_WIN32
-#define NEEDRDH 1
 #include "win32/readdir.h"
 #endif
 #include <time.h>

diff --git a/ext/standard/dir.c b/ext/standard/dir.c
index a79dac8c78f1edb597b26fa755b12df0b1cdfad7..d4799eebbe440284f3a4174f52608c1cb41da2d2 100644 (file)
--- a/ext/standard/dir.c
+++ b/ext/standard/dir.c
@@ -37,7 +37,6 @@
 #include <errno.h>
 
 #ifdef PHP_WIN32
-#define NEEDRDH 1
 #include "win32/readdir.h"
 #endif
 

diff --git a/main/reentrancy.c b/main/reentrancy.c
index 866cf4273ee3c3bcc6e2948de106a2b17eb8e697..79e4f13da313a4181889fc184d7103098b6d2e37 100644 (file)
--- a/main/reentrancy.c
+++ b/main/reentrancy.c
@@ -25,7 +25,6 @@
 #endif
 
 #ifdef PHP_WIN32
-#define NEEDRDH 1
 #include "win32/readdir.h"
 #endif
 

diff --git a/win32/readdir.c b/win32/readdir.c
index ed799a6747d00cffa145ebeda45e5297b5c61ede..e2f30f11bab1ff66f153bd191bc603054a6b5a69 100644 (file)
--- a/win32/readdir.c
+++ b/win32/readdir.c
@@ -2,7 +2,6 @@
 #include <string.h>
 #include <errno.h>
 
-#define NEEDRDH 1
 #include "readdir.h"
 #include "php.h"
 

diff --git a/win32/readdir.h b/win32/readdir.h
index c2c969842aab5b88e9878cac4d663329d46f9f2e..f6c576252c650c379fa4add5138371a696da8aab 100644 (file)
--- a/win32/readdir.h
+++ b/win32/readdir.h
@@ -1,3 +1,7 @@
+#ifndef _READDIR_H
+#define _READDIR_H
+
+
 /*
  * Structures and types used to implement opendir/readdir/closedir
  * on Windows 95/NT.
@@ -10,7 +14,6 @@
 
 
 /* struct dirent - same as Unix */
-#if NEEDRDH
 
 struct dirent {
        long d_ino;                                     /* inode (always 1 in WIN32) */
@@ -19,6 +22,7 @@ struct dirent {
        char d_name[_MAX_FNAME + 1];    /* filename (null terminated) */
 };
 
+
 /* typedef DIR - not the same as Unix */
 typedef struct {
        long handle;                            /* _findfirst/_findnext handle */
@@ -36,4 +40,5 @@ int readdir_r(DIR *, struct dirent *, struct dirent **);
 int closedir(DIR *);
 void rewinddir(DIR *);
 
-#endif
+
+#endif /* _READDIR_H */
\ No newline at end of file