helly Tue Dec 2 02:13:54 2003 EDT
Modified files:
/spl spl_directory.c spl_directory.h
Log:
Move object struct to header.
Index: spl/spl_directory.c
diff -u spl/spl_directory.c:1.15 spl/spl_directory.c:1.16
--- spl/spl_directory.c:1.15 Sat Nov 29 13:31:24 2003
+++ spl/spl_directory.c Tue Dec 2 02:13:53 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_directory.c,v 1.15 2003/11/29 18:31:24 helly Exp $ */
+/* $Id: spl_directory.c,v 1.16 2003/12/02 07:13:53 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -33,6 +33,7 @@
#include "spl_functions.h"
#include "spl_engine.h"
#include "spl_iterators.h"
+#include "spl_directory.h"
#include "php.h"
#include "fopen_wrappers.h"
@@ -107,19 +108,6 @@
zend_class_entry *spl_ce_RecursiveDirectoryIterator;
-/* the overloaded class structure */
-
-/* overloading the structure results in the need of having
- dedicated creatin/cloning/destruction functions */
-typedef struct _spl_ce_dir_object {
- zend_object std;
- php_stream *dirp;
- php_stream_dirent entry;
- char *path;
- int index;
-} spl_ce_dir_object;
-
-
/* {{{ spl_ce_dir_object_dtor */
/* close all resources and the memory allocated for the object */
static void spl_ce_dir_object_dtor(void *object, zend_object_handle handle TSRMLS_DC)
Index: spl/spl_directory.h
diff -u spl/spl_directory.h:1.1 spl/spl_directory.h:1.2
--- spl/spl_directory.h:1.1 Sun Nov 9 09:05:35 2003
+++ spl/spl_directory.h Tue Dec 2 02:13:53 2003
@@ -26,6 +26,14 @@
PHP_MINIT_FUNCTION(spl_directory);
+typedef struct _spl_ce_dir_object {
+ zend_object std;
+ php_stream *dirp;
+ php_stream_dirent entry;
+ char *path;
+ int index;
+} spl_ce_dir_object;
+
#endif /* SPL_DIRECTORY_H */
/*
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
