helly Fri Nov 7 04:26:19 2003 EDT
Modified files:
/php-src/ext/standard basic_functions.h php_filestat.h
Log:
Move typedef to where it is needed now.
Index: php-src/ext/standard/basic_functions.h
diff -u php-src/ext/standard/basic_functions.h:1.124
php-src/ext/standard/basic_functions.h:1.125
--- php-src/ext/standard/basic_functions.h:1.124 Fri Oct 3 22:51:19 2003
+++ php-src/ext/standard/basic_functions.h Fri Nov 7 04:26:18 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.h,v 1.124 2003/10/04 02:51:19 moriyoshi Exp $ */
+/* $Id: basic_functions.h,v 1.125 2003/11/07 09:26:18 helly Exp $ */
#ifndef BASIC_FUNCTIONS_H
#define BASIC_FUNCTIONS_H
@@ -28,6 +28,8 @@
#include <wchar.h>
#endif
+#include "php_filestat.h"
+
#include "zend_highlight.h"
#include "url_scanner.h"
@@ -119,12 +121,6 @@
PHP_FUNCTION(stream_bucket_new);
PHP_MINIT_FUNCTION(user_filters);
PHP_RSHUTDOWN_FUNCTION(user_filters);
-
-#ifdef PHP_WIN32
-typedef unsigned int php_stat_len;
-#else
-typedef int php_stat_len;
-#endif
PHPAPI int _php_error_log(int opt_err, char *message, char *opt, char *headers
TSRMLS_DC);
Index: php-src/ext/standard/php_filestat.h
diff -u php-src/ext/standard/php_filestat.h:1.21
php-src/ext/standard/php_filestat.h:1.22
--- php-src/ext/standard/php_filestat.h:1.21 Fri Nov 7 04:16:16 2003
+++ php-src/ext/standard/php_filestat.h Fri Nov 7 04:26:18 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_filestat.h,v 1.21 2003/11/07 09:16:16 helly Exp $ */
+/* $Id: php_filestat.h,v 1.22 2003/11/07 09:26:18 helly Exp $ */
#ifndef PHP_FILESTAT_H
#define PHP_FILESTAT_H
@@ -73,6 +73,12 @@
#define getgroups(a, b) 0
#define getgid() 1
#define getuid() 1
+#endif
+
+#ifdef PHP_WIN32
+typedef unsigned int php_stat_len;
+#else
+typedef int php_stat_len;
#endif
PHPAPI void php_stat(const char *filename, php_stat_len filename_length, int type,
pval *return_value TSRMLS_DC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
