cvs: php4 / NEWS reentrancy.c /ext/session/ mod_files.c /ext/standard/ dir.c /win32/ readdir.c readdir.h

zeev		Sun Jun  4 15:00:17 2000 EDT

  Modified files:
    /php4	NEWS reentrancy.c 
    /php4/ext/session	mod_files.c 
    /php4/ext/standard	dir.c 
    /php4/win32	readdir.c readdir.h 
  Log:
  Fix Win32 build
  
  
Index: php4/NEWS
diff -u php4/NEWS:1.274 php4/NEWS:1.275
--- php4/NEWS:1.274	Sun Jun  4 14:34:56 2000
+++ php4/NEWS	Sun Jun  4 15:00:17 2000
@@ -5,7 +5,9 @@
 - 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)
Index: php4/reentrancy.c
diff -u php4/reentrancy.c:1.20 php4/reentrancy.c:1.21
--- php4/reentrancy.c:1.20	Wed May 24 07:46:13 2000
+++ php4/reentrancy.c	Sun Jun  4 15:00:17 2000
@@ -25,7 +25,6 @@
 #endif
 
 #ifdef PHP_WIN32
-#define NEEDRDH 1
 #include "win32/readdir.h"
 #endif
 
Index: php4/ext/session/mod_files.c
diff -u php4/ext/session/mod_files.c:1.35 php4/ext/session/mod_files.c:1.36
--- php4/ext/session/mod_files.c:1.35	Sat May 27 09:38:49 2000
+++ php4/ext/session/mod_files.c	Sun Jun  4 15:00:17 2000
@@ -31,7 +31,6 @@
 #endif
 
 #ifdef PHP_WIN32
-#define NEEDRDH 1
 #include "win32/readdir.h"
 #endif
 #include <time.h>
Index: php4/ext/standard/dir.c
diff -u php4/ext/standard/dir.c:1.36 php4/ext/standard/dir.c:1.37
--- php4/ext/standard/dir.c:1.36	Sun Jun  4 01:29:11 2000
+++ php4/ext/standard/dir.c	Sun Jun  4 15:00:17 2000
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: dir.c,v 1.36 2000/06/04 08:29:11 stas Exp $ */
+/* $Id: dir.c,v 1.37 2000/06/04 22:00:17 zeev Exp $ */
 
 /* {{{ includes/startup/misc */
 
@@ -37,7 +37,6 @@
 #include <errno.h>
 
 #ifdef PHP_WIN32
-#define NEEDRDH 1
 #include "win32/readdir.h"
 #endif
 
Index: php4/win32/readdir.c
diff -u php4/win32/readdir.c:1.4 php4/win32/readdir.c:1.5
--- php4/win32/readdir.c:1.4	Wed May 24 07:46:13 2000
+++ php4/win32/readdir.c	Sun Jun  4 15:00:17 2000
@@ -2,7 +2,6 @@
 #include <string.h>
 #include <errno.h>
 
-#define NEEDRDH 1
 #include "readdir.h"
 #include "php.h"
 
Index: php4/win32/readdir.h
diff -u php4/win32/readdir.h:1.3 php4/win32/readdir.h:1.4
--- php4/win32/readdir.h:1.3	Tue May 23 07:58:43 2000
+++ php4/win32/readdir.h	Sun Jun  4 15:00:17 2000
@@ -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 @@
 	char d_name[_MAX_FNAME + 1];	/* filename (null terminated) */
 };
 
+
 /* typedef DIR - not the same as Unix */
 typedef struct {
 	long handle;				/* _findfirst/_findnext handle */
@@ -35,5 +39,6 @@
 int readdir_r(DIR *, struct dirent *, struct dirent **);
 int closedir(DIR *);
 void rewinddir(DIR *);
+
 
-#endif
+#endif /* _READDIR_H */
\ No newline at end of file