[PHP-DEV] Re: [PHP-CVS] cvs: php4 / configure.in /main php_ini.c php_scandir.cphp_scandir.h /win32 readdir.c readdir.h

[Sebastian Bergmann]

Ilia Alshanetsky wrote:

iliaa		Mon Jan 27 15:39:31 2003 EDT

  Added files:
    /php4/main	php_scandir.c php_scandir.h

  Modified files:
    /php4/win32	readdir.h readdir.c
    /php4	configure.in
    /php4/main	php_ini.c
  Log:
  Moved the scandir code into it's own files so that it can be used by other
  OSes where libc does not have a native scandir() implementation.

 This broke the Win32 build.

 The attached patch works for me, but I'd like it reviewed before I
 commit.

--
 Sebastian Bergmann
 http://sebastian-bergmann.de/                 http://phpOpenTracker.de/

 Did I help you? Consider a gift: http://wishlist.sebastian-bergmann.de/

Index: main/php_scandir.c
===================================================================
RCS file: /repository/php4/main/php_scandir.c,v
retrieving revision 1.1
diff -u -r1.1 php_scandir.c
--- main/php_scandir.c  27 Jan 2003 20:39:31 -0000      1.1
+++ main/php_scandir.c  27 Jan 2003 21:08:29 -0000
@@ -18,7 +18,11 @@
  */

 #include "php_scandir.h"
+#ifdef PHP_WIN32
+#include "config.w32.h"
+#else
 #include "php_config.h"
+#endif

 #ifndef HAVE_SCANDIR
  #include <sys/types.h>
Index: main/php_scandir.h
===================================================================
RCS file: /repository/php4/main/php_scandir.h,v
retrieving revision 1.1
diff -u -r1.1 php_scandir.h
--- main/php_scandir.h  27 Jan 2003 20:39:31 -0000      1.1
+++ main/php_scandir.h  27 Jan 2003 21:08:29 -0000
@@ -1,12 +1,14 @@
 #include <sys/types.h>
-#include "php_config.h"

 #ifdef HAVE_DIRENT_H
 # include <dirent.h>
 #endif

 #ifdef PHP_WIN32
+#include "config.w32.h"
 #include "win32/readdir.h"
+#else
+#include "php_config.h"
 #endif

 #ifndef HAVE_ALPHASORT
Index: win32/php4dllts.dsp
===================================================================
RCS file: /repository/php4/win32/php4dllts.dsp,v
retrieving revision 1.100
diff -u -r1.100 php4dllts.dsp
--- win32/php4dllts.dsp 23 Jan 2003 09:35:02 -0000      1.100
+++ win32/php4dllts.dsp 27 Jan 2003 21:08:32 -0000
@@ -214,6 +214,10 @@
 # End Source File

 # Begin Source File



+SOURCE="..\main\php_scandir.c"

+# End Source File

+# Begin Source File

+

 SOURCE=..\main\php_ticks.c

 # End Source File

 # Begin Source File

-- 
PHP Development Mailing List <http://www.php.net/>
To unsubscribe, visit: http://www.php.net/unsub.php