cvs: php-src(PHP_5_2) /main php_scandir.c /win32 readdir.h
| From: | Frank M. Kromann | Date: | Fri, 01 Dec 2006 20:17:50 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /main php_scandir.c /win32 readdir.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-41825@lists.php.net to get a copy of this message | ||
fmk Fri Dec 1 20:17:50 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main php_scandir.c
/php-src/win32 readdir.h
Log:
Fix win32 build
http://cvs.php.net/viewvc.cgi/php-src/main/php_scandir.c?r1=1.12.2.1.2.1&r2=1.12.2.1.2.2&diff_format=u
Index: php-src/main/php_scandir.c
diff -u php-src/main/php_scandir.c:1.12.2.1.2.1 php-src/main/php_scandir.c:1.12.2.1.2.2
--- php-src/main/php_scandir.c:1.12.2.1.2.1 Thu Nov 30 16:10:38 2006
+++ php-src/main/php_scandir.c Fri Dec 1 20:17:50 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_scandir.c,v 1.12.2.1.2.1 2006/11/30 16:10:38 iliaa Exp $ */
+/* $Id: php_scandir.c,v 1.12.2.1.2.2 2006/12/01 20:17:50 fmk Exp $ */
#include "php_scandir.h"
@@ -32,6 +32,7 @@
#ifndef HAVE_SCANDIR
#ifdef PHP_WIN32
+#include "win32/param.h"
#include "win32/readdir.h"
#endif
http://cvs.php.net/viewvc.cgi/php-src/win32/readdir.h?r1=1.8.6.1&r2=1.8.6.2&diff_format=u
Index: php-src/win32/readdir.h
diff -u php-src/win32/readdir.h:1.8.6.1 php-src/win32/readdir.h:1.8.6.2
--- php-src/win32/readdir.h:1.8.6.1 Fri Nov 10 11:20:47 2006
+++ php-src/win32/readdir.h Fri Dec 1 20:17:50 2006
@@ -17,6 +17,8 @@
#include <sys/types.h>
#include <direct.h>
+#define php_readdir_r readdir_r
+
/* struct dirent - same as Unix */
struct dirent {