partially revert previous commit and

change zend_modules.h to include
a forward declaration to zend_ini_entry

diff --git a/Zend/zend_ini.h b/Zend/zend_ini.h
index 9d6a1cb82788dba108717fda8e1d29cc7939e71c..e6cd22a7709d8112a3d942fed2e03bcbf6726cff 100644 (file)
--- a/Zend/zend_ini.h
+++ b/Zend/zend_ini.h
@@ -56,7 +56,31 @@
 
 #endif
 
-#include "zend_ini_entry.h"
+typedef struct _zend_ini_entry zend_ini_entry;
+
+#define ZEND_INI_MH(name) int name(zend_ini_entry *entry, char *new_value, uint new_value_length, void *mh_arg1, void *mh_arg2, void *mh_arg3, int stage TSRMLS_DC)
+#define ZEND_INI_DISP(name) void name(zend_ini_entry *ini_entry, int type)
+
+struct _zend_ini_entry {
+       int module_number;
+       int modifyable;
+       char *name;
+       uint name_length;
+       ZEND_INI_MH((*on_modify));
+       void *mh_arg1;
+       void *mh_arg2;
+       void *mh_arg3;
+
+       char *value;
+       uint value_length;
+
+       char *orig_value;
+       uint orig_value_length;
+       int modified;
+
+       void (*displayer)(zend_ini_entry *ini_entry, int type);
+};
+
 
 ZEND_API int zend_ini_startup(TSRMLS_D);
 ZEND_API int zend_ini_shutdown(TSRMLS_D);

diff --git a/Zend/zend_ini_entry.h b/Zend/zend_ini_entry.h
deleted file mode 100644 (file)
index 862a7a9..0000000
--- a/Zend/zend_ini_entry.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | Zend Engine                                                          |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2003 Zend Technologies Ltd. (http://www.zend.com) |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 2.00 of the Zend license,     |
-   | that is bundled with this package in the file LICENSE, and is        |
-   | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/2_00.txt.                                |
-   | If you did not receive a copy of the Zend license and are unable to  |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@zend.com so we can mail you a copy immediately.              |
-   +----------------------------------------------------------------------+
-   | Author: Harald Radi <harald.radi@nme.at>                             |
-   +----------------------------------------------------------------------+
-*/
-
-
-#ifndef ZEND_INI_ENTRY_H
-#define ZEND_INI_ENTRY_H
-
-#define ZEND_INI_MH(name) int name(zend_ini_entry *entry, char *new_value, uint new_value_length, void *mh_arg1, void *mh_arg2, void *mh_arg3, int stage TSRMLS_DC)
-#define ZEND_INI_DISP(name) void name(zend_ini_entry *ini_entry, int type)
-
-typedef struct _zend_ini_entry zend_ini_entry;
-
-struct _zend_ini_entry {
-       int module_number;
-       int modifyable;
-       char *name;
-       uint name_length;
-       ZEND_INI_MH((*on_modify));
-       void *mh_arg1;
-       void *mh_arg2;
-       void *mh_arg3;
-
-       char *value;
-       uint value_length;
-
-       char *orig_value;
-       uint orig_value_length;
-       int modified;
-
-       void (*displayer)(zend_ini_entry *ini_entry, int type);
-};
-
-#endif /* ZEND_INI_ENTRY_H */
\ No newline at end of file

diff --git a/Zend/zend_modules.h b/Zend/zend_modules.h
index af24cd567a7adb0afec94b6e97d76cf213796474..b03a43153cb6d6e8c504f839654db29b7c0b7f17 100644 (file)
--- a/Zend/zend_modules.h
+++ b/Zend/zend_modules.h
@@ -22,7 +22,6 @@
 #define MODULES_H
 
 #include "zend.h"
-#include "zend_ini_entry.h"
 
 #define INIT_FUNC_ARGS         int type, int module_number TSRMLS_DC
 #define INIT_FUNC_ARGS_PASSTHRU        type, module_number TSRMLS_CC
@@ -55,6 +54,7 @@ ZEND_API extern unsigned char third_arg_force_ref[];
 #define MODULE_PERSISTENT 1
 #define MODULE_TEMPORARY 2
 
+struct zend_ini_entry;
 typedef struct _zend_module_entry zend_module_entry;
 
 struct _zend_module_entry {
@@ -62,7 +62,7 @@ struct _zend_module_entry {
        unsigned int zend_api;
        unsigned char zend_debug;
        unsigned char zts;
-       zend_ini_entry *ini_entry;
+       struct zend_ini_entry *ini_entry;
        char *name;
        zend_function_entry *functions;
        int (*module_startup_func)(INIT_FUNC_ARGS);