pajoye Tue Dec 2 10:15:08 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/main php_scandir.c php_scandir.h
Log:
- export php_scandir and php_alphasort correctly (used by APC for example)
http://cvs.php.net/viewvc.cgi/php-src/main/php_scandir.c?r1=1.12.2.1.2.5.2.1&r2=1.12.2.1.2.5.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.5.2.1
php-src/main/php_scandir.c:1.12.2.1.2.5.2.2
--- php-src/main/php_scandir.c:1.12.2.1.2.5.2.1 Mon Dec 31 07:17:17 2007
+++ php-src/main/php_scandir.c Tue Dec 2 10:15:08 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_scandir.c,v 1.12.2.1.2.5.2.1 2007/12/31 07:17:17 sebastian Exp $ */
+/* $Id: php_scandir.c,v 1.12.2.1.2.5.2.2 2008/12/02 10:15:08 pajoye Exp $ */
#include "php.h"
#include "php_scandir.h"
@@ -50,14 +50,14 @@
#include <string.h>
#endif
-int php_alphasort(const struct dirent **a, const struct dirent **b)
+PHPAPI int php_alphasort(const struct dirent **a, const struct dirent **b)
{
return strcoll((*a)->d_name,(*b)->d_name);
}
#endif /* HAVE_ALPHASORT */
#ifndef HAVE_SCANDIR
-int php_scandir(const char *dirname, struct dirent **namelist[], int
(*selector) (const struct dirent *entry), int (*compare) (const struct dirent
**a, const struct dirent **b))
+PHPAPI int php_scandir(const char *dirname, struct dirent **namelist[], int
(*selector) (const struct dirent *entry), int (*compare) (const struct dirent
**a, const struct dirent **b))
{
DIR *dirp = NULL;
struct dirent **vector = NULL;
http://cvs.php.net/viewvc.cgi/php-src/main/php_scandir.h?r1=1.12.2.1.2.1.2.1&r2=1.12.2.1.2.1.2.2&diff_format=u
Index: php-src/main/php_scandir.h
diff -u php-src/main/php_scandir.h:1.12.2.1.2.1.2.1
php-src/main/php_scandir.h:1.12.2.1.2.1.2.2
--- php-src/main/php_scandir.h:1.12.2.1.2.1.2.1 Mon Dec 31 07:17:17 2007
+++ php-src/main/php_scandir.h Tue Dec 2 10:15:08 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_scandir.h,v 1.12.2.1.2.1.2.1 2007/12/31 07:17:17 sebastian Exp $ */
+/* $Id: php_scandir.h,v 1.12.2.1.2.1.2.2 2008/12/02 10:15:08 pajoye Exp $ */
#ifndef PHP_SCANDIR_H
#define PHP_SCANDIR_H
@@ -42,13 +42,13 @@
#ifdef HAVE_SCANDIR
#define php_scandir scandir
#else
-int php_scandir(const char *dirname, struct dirent **namelist[], int
(*selector) (const struct dirent *entry), int (*compare) (const struct dirent
**a, const struct dirent **b));
+PHPAPI int php_scandir(const char *dirname, struct dirent **namelist[], int
(*selector) (const struct dirent *entry), int (*compare) (const struct dirent
**a, const struct dirent **b));
#endif
#ifdef HAVE_ALPHASORT
#define php_alphasort alphasort
#else
-int php_alphasort(const struct dirent **a, const struct dirent **b);
+PHPAPI int php_alphasort(const struct dirent **a, const struct dirent **b);
#endif
#endif /* PHP_SCANDIR_H */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
