Modified: pecl/Net_Gopher/trunk/gopher_fopen_wrapper.c
===================================================================
--- pecl/Net_Gopher/trunk/gopher_fopen_wrapper.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/Net_Gopher/trunk/gopher_fopen_wrapper.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -33,7 +33,7 @@
 #include <sys/socket.h>
 #endif

-function_entry gopher_functions[] = {
+zend_function_entry gopher_functions[] = {
 	PHP_FE(gopher_parsedir,							NULL)
 	{NULL, NULL, NULL}
 };

Modified: pecl/PECL_Gen/trunk/Extension.php
===================================================================
--- pecl/PECL_Gen/trunk/Extension.php	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/PECL_Gen/trunk/Extension.php	2010-03-31 20:39:48 UTC (rev 297236)
@@ -1039,7 +1039,7 @@
     function generate_function_registrations()
     {
         $code  = "/* {{{ {$this->name}_functions[] */\n";
-        $code .= "function_entry {$this->name}_functions[] = {\n";
+        $code .= "zend_function_entry {$this->name}_functions[] = {\n";
         foreach ($this->functions as $function) {
             $code .=  sprintf("    PHP_FE(%-20s, NULL)\n",$function->name);
         }

Modified: pecl/adt/trunk/php_adt.c
===================================================================
--- pecl/adt/trunk/php_adt.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/adt/trunk/php_adt.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -404,7 +404,7 @@

 /* {{{ adt_functions
  */
-function_entry adt_functions[] = {
+zend_function_entry adt_functions[] = {
 	PHP_FE(adt_stack_new,                NULL)
 	PHP_FE(adt_stack_push,               NULL)
 	PHP_FE(adt_stack_pop,                NULL)
@@ -476,7 +476,7 @@

 /* {{{ queue_class_functions
  */
-function_entry queue_class_functions[] = {
+zend_function_entry queue_class_functions[] = {
 	PHP_FALIAS(adt_queue,   adt_queue_new,     NULL)
 	PHP_FALIAS(extract,     adt_queue_extract, NULL)
 	PHP_FALIAS(insert,      adt_queue_insert,  NULL)
@@ -488,7 +488,7 @@

 /* {{{ stack_class_functions
  */
-function_entry stack_class_functions[] = {
+zend_function_entry stack_class_functions[] = {
 	PHP_FALIAS(adt_stack,   adt_stack_new,    NULL)
 	PHP_FALIAS(push,        adt_stack_push,   NULL)
 	PHP_FALIAS(pop,         adt_stack_pop,    NULL)
@@ -500,7 +500,7 @@

 /* {{{ tree_class_functions
  */
-function_entry tree_class_functions[] = {
+zend_function_entry tree_class_functions[] = {
 	PHP_FALIAS(adt_tree,     adt_tree_new,         NULL)
 	PHP_FALIAS(root,         adt_tree_root,        NULL)
 	PHP_FALIAS(insert_root,  adt_tree_insert_root, NULL)
@@ -513,7 +513,7 @@
 	{NULL, NULL, NULL}
 };

-function_entry binary_tree_node_class_functions[] = {
+zend_function_entry binary_tree_node_class_functions[] = {
 	PHP_FALIAS(left,          adt_tree_left,          NULL)
 	PHP_FALIAS(right,         adt_tree_right,         NULL)
 	PHP_FALIAS(insert_left,   adt_tree_insert_left,   NULL)
@@ -529,7 +529,7 @@

 /* {{{ heap_class_functions
  */
-function_entry heap_class_functions[] = {
+zend_function_entry heap_class_functions[] = {
 	PHP_FALIAS(adt_heap,     adt_heap_new,     NULL)
 	PHP_FALIAS(insert,       adt_heap_insert,  NULL)
 	PHP_FALIAS(extract,      adt_heap_extract, NULL)
@@ -540,7 +540,7 @@

 /* {{{ set_class_functions
  */
-function_entry set_class_functions[] = {
+zend_function_entry set_class_functions[] = {
 	PHP_FALIAS(adt_set,    adt_set_new,          NULL)
 	PHP_FALIAS(insert,     adt_set_insert,       NULL)
 	PHP_FALIAS(remove,     adt_set_remove,       NULL)
@@ -557,7 +557,7 @@

 /* {{{ graph_class_functions
  */
-function_entry graph_class_functions[] = {
+zend_function_entry graph_class_functions[] = {
 	PHP_FALIAS(adt_graph,           adt_graph_new,              NULL)
 	PHP_FALIAS(insert_vertex,       adt_graph_insert_vertex,    NULL)
 	PHP_FALIAS(insert_edge,         adt_graph_insert_edge,      NULL)

Modified: pecl/amfext/trunk/amf.c
===================================================================
--- pecl/amfext/trunk/amf.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/amfext/trunk/amf.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -32,7 +32,7 @@

 /*  module Declarations {{{1*/

-static function_entry amf_functions[] = {
+static zend_function_entry amf_functions[] = {
     PHP_FE(amf_encode, NULL)
     PHP_FE(amf_decode, NULL)
     PHP_FE(amf_join_test, NULL)

Modified: pecl/apc/trunk/apc_iterator.c
===================================================================
--- pecl/apc/trunk/apc_iterator.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/apc/trunk/apc_iterator.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -621,7 +621,7 @@
 /* }}} */

 /* {{{ apc_iterator_functions */
-static function_entry apc_iterator_functions[] = {
+static zend_function_entry apc_iterator_functions[] = {
     PHP_ME(apc_iterator, __construct, arginfo_apc_iterator___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
     PHP_ME(apc_iterator, rewind, arginfo_apc_iterator_void, ZEND_ACC_PUBLIC)
     PHP_ME(apc_iterator, current, arginfo_apc_iterator_void, ZEND_ACC_PUBLIC)

Modified: pecl/apc/trunk/php_apc.c
===================================================================
--- pecl/apc/trunk/php_apc.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/apc/trunk/php_apc.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -1749,7 +1749,7 @@
 /* }}} */

 /* {{{ apc_functions[] */
-function_entry apc_functions[] = {
+zend_function_entry apc_functions[] = {
     PHP_FE(apc_cache_info,          arginfo_apc_cache_info)
     PHP_FE(apc_clear_cache,         arginfo_apc_clear_cache)
     PHP_FE(apc_sma_info,            arginfo_apc_sma_info)

Modified: pecl/apd/trunk/php_apd.c
===================================================================
--- pecl/apd/trunk/php_apd.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/apd/trunk/php_apd.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -70,7 +70,7 @@

 /* List of exported functions. */

-function_entry apd_functions[] = {
+zend_function_entry apd_functions[] = {
 	PHP_FE(override_function, NULL)
 	PHP_FE(rename_function, NULL)
 	PHP_FE(apd_set_pprof_trace, NULL)

Modified: pecl/apm/trunk/apm.c
===================================================================
--- pecl/apm/trunk/apm.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/apm/trunk/apm.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -78,7 +78,7 @@
 /* recorded timestamp for the request */
 struct timeval begin_tp;

-function_entry apm_functions[] = {
+zend_function_entry apm_functions[] = {
 		PHP_FE(apm_get_events, NULL)
 		PHP_FE(apm_get_slow_requests, NULL)
 		PHP_FE(apm_get_events_count, NULL)

Modified: pecl/archive/trunk/archive.c
===================================================================
--- pecl/archive/trunk/archive.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/archive/trunk/archive.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -41,7 +41,7 @@

 /* {{{ archive_functions[]
  */
-function_entry archive_functions[] = {
+zend_function_entry archive_functions[] = {
 	{NULL, NULL, NULL}
 };
 /* }}} */

Modified: pecl/archive/trunk/archive_entry.c
===================================================================
--- pecl/archive/trunk/archive_entry.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/archive/trunk/archive_entry.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -29,8 +29,8 @@
 #include "php_archive.h"
 #include "php_archive_entry.h"

-/* function_entry funcs_ArchiveEntry {{{ */
-function_entry funcs_ArchiveEntry[] = {
+/* zend_function_entry funcs_ArchiveEntry {{{ */
+zend_function_entry funcs_ArchiveEntry[] = {
 	ZEND_ME(ArchiveEntry, __construct,  NULL, 0)
 	ZEND_ME(ArchiveEntry, isDir,  NULL, 0)
 	ZEND_ME(ArchiveEntry, isFile,  NULL, 0)

Modified: pecl/archive/trunk/archive_reader.c
===================================================================
--- pecl/archive/trunk/archive_reader.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/archive/trunk/archive_reader.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -32,8 +32,8 @@
 zend_class_entry *ce_ArchiveReader;
 zend_class_entry *ce_ArchiveReaderInterface;

-/* function_entry funcs_ArchiveReaderInterface {{{ */
-function_entry funcs_ArchiveReaderInterface[] = {
+/* zend_function_entry funcs_ArchiveReaderInterface {{{ */
+zend_function_entry funcs_ArchiveReaderInterface[] = {
  	ZEND_ABSTRACT_ME(ArchiveReader, __construct,  NULL)
 	ZEND_ABSTRACT_ME(ArchiveReader, getNextEntry,  NULL)
 	ZEND_ABSTRACT_ME(ArchiveReader, getCurrentEntryData,  NULL)
@@ -43,8 +43,8 @@
 };
 /* }}} */

-/* function_entry funcs_ArchiveReader {{{ */
-function_entry funcs_ArchiveReader[] = {
+/* zend_function_entry funcs_ArchiveReader {{{ */
+zend_function_entry funcs_ArchiveReader[] = {
  	ZEND_ME(ArchiveReader, __construct,  NULL, 0)
 	ZEND_ME(ArchiveReader, getNextEntry,  NULL, 0)
 	ZEND_ME(ArchiveReader, getCurrentEntryData,  NULL, 0)

Modified: pecl/archive/trunk/archive_writer.c
===================================================================
--- pecl/archive/trunk/archive_writer.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/archive/trunk/archive_writer.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -35,8 +35,8 @@
 zend_class_entry *ce_ArchiveWriter;
 zend_class_entry *ce_ArchiveWriterInterface;

-/* function_entry funcs_ArchiveWriterInterface {{{ */
-function_entry funcs_ArchiveWriterInterface[] = {
+/* zend_function_entry funcs_ArchiveWriterInterface {{{ */
+zend_function_entry funcs_ArchiveWriterInterface[] = {
  	ZEND_ABSTRACT_ME(ArchiveWriter, __construct,  NULL)
 	ZEND_ABSTRACT_ME(ArchiveWriter, addEntry,  NULL)
 	ZEND_ABSTRACT_ME(ArchiveWriter, finish,  NULL)
@@ -44,8 +44,8 @@
 };
 /* }}} */

-/* function_entry funcs_ArchiveWriter {{{ */
-function_entry funcs_ArchiveWriter[] = {
+/* zend_function_entry funcs_ArchiveWriter {{{ */
+zend_function_entry funcs_ArchiveWriter[] = {
  	ZEND_ME(ArchiveWriter, __construct,  NULL, 0)
 	ZEND_ME(ArchiveWriter, addEntry,  NULL, 0)
 	ZEND_ME(ArchiveWriter, finish,  NULL, 0)

Modified: pecl/axis2/trunk/axis2.c
===================================================================
--- pecl/axis2/trunk/axis2.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/axis2/trunk/axis2.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -53,7 +53,7 @@
  *
  * Every user visible function must have an entry in axis2_functions[].
  */
-function_entry axis2_functions[] = {
+zend_function_entry axis2_functions[] = {
 	PHP_FE(confirm_axis2_compiled,	NULL)		/* For testing, remove later. */
 	{NULL, NULL, NULL}	/* Must be the last line in axis2_functions[] */
 };

Modified: pecl/bbcode/trunk/php_bbcode.c
===================================================================
--- pecl/bbcode/trunk/php_bbcode.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/bbcode/trunk/php_bbcode.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -601,7 +601,7 @@
 }
 /* }}} */

-static function_entry bbcode_functions[] = { /* {{{ */
+static zend_function_entry bbcode_functions[] = { /* {{{ */
 	PHP_FE(bbcode_create,         NULL)
 	PHP_FE(bbcode_add_element,    NULL)
 	PHP_FE(bbcode_destroy,        NULL)

Modified: pecl/bcompiler/trunk/bcompiler.c
===================================================================
--- pecl/bcompiler/trunk/bcompiler.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/bcompiler/trunk/bcompiler.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -167,7 +167,7 @@
  *
  * All the functions in bcompiler
  */
-function_entry bcompiler_functions[] = {
+zend_function_entry bcompiler_functions[] = {
 	PHP_FE(bcompiler_write_header,              NULL)
 	PHP_FE(bcompiler_write_class,               NULL)
 	PHP_FE(bcompiler_write_function,            NULL)

Modified: pecl/bitset/trunk/bitset.c
===================================================================
--- pecl/bitset/trunk/bitset.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/bitset/trunk/bitset.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -131,7 +131,7 @@

 /* {{{ bitset_functions[]
  */
-function_entry bitset_functions[] = {
+zend_function_entry bitset_functions[] = {
 	PHP_FE(bitset_empty, arginfo_bitset_empty)
 	PHP_FE(bitset_incl, arginfo_bitset_incl)
 	PHP_FE(bitset_excl, arginfo_bitset_excl)

Modified: pecl/blenc/trunk/blenc.c
===================================================================
--- pecl/blenc/trunk/blenc.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/blenc/trunk/blenc.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -42,7 +42,7 @@
 HashTable *php_bl_keys;

 /* {{{ blenc_functions[] */
-function_entry blenc_functions[] = {
+zend_function_entry blenc_functions[] = {
 	PHP_FE(blenc_encrypt,	NULL)
 	{NULL, NULL, NULL}
 };

Modified: pecl/cairo/trunk/cairo.c
===================================================================
--- pecl/cairo/trunk/cairo.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/cairo/trunk/cairo.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -790,7 +790,7 @@
 /* }}} */

 /* {{{ cairo_functions[] */
-static const function_entry cairo_functions[] = {
+static const zend_function_entry cairo_functions[] = {
 	/* Cairo Functions */
 	PHP_FE(cairo_version, NULL)
 	PHP_FE(cairo_version_string, NULL)

Modified: pecl/chasen/trunk/php_chasen.c
===================================================================
--- pecl/chasen/trunk/php_chasen.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/chasen/trunk/php_chasen.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -38,7 +38,7 @@
 static char *php_chasen_command = "chasen";
 static char *php_chasen_argv_wakati[] = {"chasen", "-F%m ", NULL};

-function_entry chasen_functions[] = {
+zend_function_entry chasen_functions[] = {
 	PHP_FE(chasen,	NULL)
 	PHP_FE(chasen_split,	NULL)
 	{NULL, NULL, NULL}

Modified: pecl/classkit/trunk/classkit.c
===================================================================
--- pecl/classkit/trunk/classkit.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/classkit/trunk/classkit.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -37,7 +37,7 @@
  *
  * Every user visible function must have an entry in classkit_functions[].
  */
-function_entry classkit_functions[] = {
+zend_function_entry classkit_functions[] = {
 	PHP_FE(classkit_method_add,					NULL)
 	PHP_FE(classkit_method_redefine,			NULL)
 	PHP_FE(classkit_method_remove,				NULL)

Modified: pecl/cpdf/trunk/cpdf.c
===================================================================
--- pecl/cpdf/trunk/cpdf.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/cpdf/trunk/cpdf.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -95,7 +95,7 @@
 		RETURN_FALSE; \
 	} \

-function_entry cpdf_functions[] = {
+zend_function_entry cpdf_functions[] = {
   PHP_FE(cpdf_global_set_document_limits, NULL)
 	PHP_FE(cpdf_set_creator, NULL)
 	PHP_FE(cpdf_set_title, NULL)

Modified: pecl/crack/trunk/crack.c
===================================================================
--- pecl/crack/trunk/crack.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/crack/trunk/crack.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -38,7 +38,7 @@

 /* {{{ crack_functions[]
  */
-function_entry crack_functions[] = {
+zend_function_entry crack_functions[] = {
 	PHP_FE(crack_opendict,			NULL)
 	PHP_FE(crack_closedict,			NULL)
 	PHP_FE(crack_check,				NULL)

Modified: pecl/cvsclient/trunk/cvsclient.c
===================================================================
--- pecl/cvsclient/trunk/cvsclient.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/cvsclient/trunk/cvsclient.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -1096,7 +1096,7 @@
 /* Module Housekeeping */
 /* ******************* */

-function_entry cvsclient_functions[] = {
+zend_function_entry cvsclient_functions[] = {
 	PHP_FE(cvsclient_connect, 											NULL)
 	PHP_FE(cvsclient_login, 											NULL)
 	PHP_FE(cvsclient_retrieve,											NULL)

Modified: pecl/cybercash/trunk/cybercash.c
===================================================================
--- pecl/cybercash/trunk/cybercash.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/cybercash/trunk/cybercash.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -33,7 +33,7 @@

 /* {{{ cybercash_functions[]
  */
-function_entry cybercash_functions[] = {
+zend_function_entry cybercash_functions[] = {
 	PHP_FE(cybercash_encr, NULL)
 	PHP_FE(cybercash_decr, NULL)
 	PHP_FE(cybercash_base64_encode, NULL)

Modified: pecl/cybermut/trunk/cybermut.c
===================================================================
--- pecl/cybermut/trunk/cybermut.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/cybermut/trunk/cybermut.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -36,7 +36,7 @@
 PHP_FUNCTION(cybermut_creerreponsecm);

 /* {{{ cybermut_functions[] */
-function_entry cybermut_functions[] = {
+zend_function_entry cybermut_functions[] = {
 	PHP_FE(cybermut_creerformulairecm,	NULL)
 	PHP_FE(cybermut_testmac,	NULL)
 	PHP_FE(cybermut_creerreponsecm,	NULL)

Modified: pecl/cyrus/trunk/cyrus.c
===================================================================
--- pecl/cyrus/trunk/cyrus.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/cyrus/trunk/cyrus.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -40,7 +40,7 @@
 static int le_cyrus;
 #define le_cyrus_name "Cyrus IMAP connection"

-function_entry cyrus_functions[] = {
+zend_function_entry cyrus_functions[] = {
 	PHP_FE(cyrus_connect,		NULL)
 	PHP_FE(cyrus_authenticate,	NULL)
 	PHP_FE(cyrus_bind,			NULL)

Modified: pecl/daffodildb/trunk/daffodildb.c
===================================================================
--- pecl/daffodildb/trunk/daffodildb.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/daffodildb/trunk/daffodildb.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -192,7 +192,7 @@
 	/* {{{ daffodildb_functions[]

 	 */
-	function_entry daffodildb_functions[] = {
+	zend_function_entry daffodildb_functions[] = {
 	  PHP_FE(daffodildb_connect,NULL)
 	  PHP_FE(daffodildb_close,NULL)
 	  PHP_FE(daffodildb_commit,NULL)

Modified: pecl/date/trunk/date.c
===================================================================
--- pecl/date/trunk/date.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/date/trunk/date.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -305,7 +305,7 @@
  *
  * Every user visible function must have an entry in date_functions[].
  */
-function_entry date_functions[] = {
+zend_function_entry date_functions[] = {
 	PHP_FE(date_new,	NULL)
 	PHP_FE(date_free,	NULL)
 	PHP_FE(date_new_julian,	NULL)
@@ -437,7 +437,7 @@

 /* {{{ date_class_functions
  */
-function_entry date_class_functions[] = {
+zend_function_entry date_class_functions[] = {
 	PHP_ME_MAPPING(date, date_ctor, NULL)     /* constructor */
 	PHP_ME_MAPPING(setDMY, date_set_dmy, NULL)
 	PHP_ME_MAPPING(isValid, date_valid, NULL)

Modified: pecl/dazuko/trunk/dazuko.c
===================================================================
--- pecl/dazuko/trunk/dazuko.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/dazuko/trunk/dazuko.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -67,7 +67,7 @@
  *
  * Every user visible function must have an entry in dazuko_functions[].
  */
-function_entry dazuko_functions[] = {
+zend_function_entry dazuko_functions[] = {
 	/* PHP_DAZUKO API */
 	PHP_FE(dazuko_module_loaded,		NULL)			/* Check, whether dazuko mod is loaded */
 	PHP_FE(dazuko_fetch_result,		NULL)			/* Fetch dazuko result resource */

Modified: pecl/db/trunk/db.c
===================================================================
--- pecl/db/trunk/db.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/db/trunk/db.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -1162,7 +1162,7 @@

 /* {{{ dbm_functions[]
  */
-function_entry dbm_functions[] = {
+zend_function_entry dbm_functions[] = {
 	PHP_FE(dblist,									NULL)
 	PHP_FE(dbmopen,									NULL)
 	PHP_FE(dbmclose,								NULL)

Modified: pecl/dbdo/trunk/dbdo.c
===================================================================
--- pecl/dbdo/trunk/dbdo.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/dbdo/trunk/dbdo.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -182,13 +182,13 @@
  *
  * Every user visible function must have an entry in dbdo_functions[].
  */
-function_entry dbdo_functions[] = {
+zend_function_entry dbdo_functions[] = {
 	{NULL, NULL, NULL}	/* Must be the last line in dbdo_functions[] */
 };
 /* }}} */


-function_entry dbdo_funcs_exception[] = {
+zend_function_entry dbdo_funcs_exception[] = {
 	{NULL, NULL, NULL}
 };

@@ -208,7 +208,7 @@
 ZEND_END_ARG_INFO()

 /* and now our object.. */
-function_entry dbdo_class_functions[] = {
+zend_function_entry dbdo_class_functions[] = {
 	PHP_ME(dbdo, 		__construct, NULL,0)
 	PHP_ME(dbdo, 		factory, NULL, 		ZEND_ACC_STATIC|ZEND_ACC_PUBLIC)
 	PHP_ME(dbdo, 		config, NULL, 		ZEND_ACC_STATIC|ZEND_ACC_PUBLIC)

Modified: pecl/dbplus/trunk/dbplus.c
===================================================================
--- pecl/dbplus/trunk/dbplus.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/dbplus/trunk/dbplus.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -62,7 +62,7 @@

 /* Every user visible function must have an entry in dbplus_functions[].
 */
-function_entry dbplus_functions[] = {
+zend_function_entry dbplus_functions[] = {
     PHP_FE(dbplus_add,  NULL)
     PHP_FE(dbplus_aql,  NULL)
     PHP_FE(dbplus_chdir,    NULL)

Modified: pecl/dbx/trunk/dbx.c
===================================================================
--- pecl/dbx/trunk/dbx.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/dbx/trunk/dbx.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -169,7 +169,7 @@

 /* Every user visible function must have an entry in dbx_functions[].
 */
-function_entry dbx_functions[] = {
+zend_function_entry dbx_functions[] = {
 	ZEND_FE(dbx_connect,	NULL)
 	ZEND_FE(dbx_close,		NULL)
 	ZEND_FE(dbx_query,		NULL)

Modified: pecl/demoext/trunk/php_demoext.c
===================================================================
--- pecl/demoext/trunk/php_demoext.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/demoext/trunk/php_demoext.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -537,7 +537,7 @@
  *
  * Every user visible function must have an entry in demoext_functions[].
  */
-function_entry demoext_functions[] = {
+zend_function_entry demoext_functions[] = {
 	{NULL, NULL, NULL}	/* Must be the last line in demoext_functions[] */
 };
 /* }}} */

Modified: pecl/dio/trunk/dio.c
===================================================================
--- pecl/dio/trunk/dio.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/dio/trunk/dio.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -709,7 +709,7 @@

 static zend_object_handlers dio_raw_object_handlers;

-static function_entry dio_functions[] = {
+static zend_function_entry dio_functions[] = {
 	/* Class functions. */

 	/* Legacy functions (Deprecated - See dio_legacy.c) */

Modified: pecl/docblock/trunk/docblock.c
===================================================================
--- pecl/docblock/trunk/docblock.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/docblock/trunk/docblock.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -39,7 +39,7 @@
  *
  * Every user visible function must have an entry in docblock_functions[].
  */
-function_entry docblock_functions[] = {
+zend_function_entry docblock_functions[] = {
 	PHP_FE(docblock_tokenize,	NULL)
 	PHP_FE(docblock_token_name,	NULL)
 	{NULL, NULL, NULL}

Modified: pecl/domxml/trunk/php_domxml.c
===================================================================
--- pecl/domxml/trunk/php_domxml.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/domxml/trunk/php_domxml.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -315,7 +315,7 @@
 };


-static function_entry php_domxmldoc_class_functions[] = {
+static zend_function_entry php_domxmldoc_class_functions[] = {
 	PHP_FALIAS(domdocument,				xmldoc,							NULL)
 	PHP_FALIAS(doctype, 				domxml_doc_doctype, 			NULL)
 	PHP_FALIAS(implementation,			domxml_doc_implementation,		NULL)
@@ -360,7 +360,7 @@
 	{NULL, NULL, NULL}
 };

-static function_entry php_domxmlparser_class_functions[] = {
+static zend_function_entry php_domxmlparser_class_functions[] = {
 	PHP_FALIAS(add_chunk,					domxml_parser_add_chunk,		NULL)
 	PHP_FALIAS(end,							domxml_parser_end,				NULL)
 	PHP_FALIAS(set_keep_blanks,				domxml_parser_set_keep_blanks,	NULL)
@@ -379,7 +379,7 @@
 	{NULL, NULL, NULL}
 };

-static function_entry php_domxmldoctype_class_functions[] = {
+static zend_function_entry php_domxmldoctype_class_functions[] = {
 	PHP_FALIAS(name,					domxml_doctype_name,			NULL)
 	PHP_FALIAS(entities,				domxml_doctype_entities,		NULL)
 	PHP_FALIAS(notations,				domxml_doctype_notations,		NULL)

Modified: pecl/doublemetaphone/trunk/double_metaphone.c
===================================================================
--- pecl/doublemetaphone/trunk/double_metaphone.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/doublemetaphone/trunk/double_metaphone.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -44,7 +44,7 @@

 /* {{{ doublemetaphone_functions[]
 */
-function_entry doublemetaphone_functions[] = {
+zend_function_entry doublemetaphone_functions[] = {
 	PHP_FE(double_metaphone,	NULL)
 	{NULL, NULL, NULL}
 };

Modified: pecl/dtrace/trunk/dtrace.c
===================================================================
--- pecl/dtrace/trunk/dtrace.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/dtrace/trunk/dtrace.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -33,7 +33,7 @@


 /* {{{ dtrace_functions[] */
-function_entry dtrace_functions[] = {
+zend_function_entry dtrace_functions[] = {
 	{NULL, NULL, NULL}
 };
 /* }}} */

Modified: pecl/ecasound/trunk/ecasound.c
===================================================================
--- pecl/ecasound/trunk/ecasound.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/ecasound/trunk/ecasound.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -46,7 +46,7 @@
  *
  * Every user visible function must have an entry in ecasound_functions[].
  */
-function_entry ecasound_functions[] = {
+zend_function_entry ecasound_functions[] = {
 	PHP_FE(eci_init,	NULL)
 	PHP_FE(eci_cleanup,	NULL)
 	PHP_FE(eci_command,	NULL)

Modified: pecl/enchant/trunk/enchant.c
===================================================================
--- pecl/enchant/trunk/enchant.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/enchant/trunk/enchant.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -124,7 +124,7 @@
  *
  * Every user visible function must have an entry in enchant_functions[].
  */
-function_entry enchant_functions[] = {
+zend_function_entry enchant_functions[] = {
 	PHP_FE(enchant_broker_init, 			arginfo_enchant_broker_init)
 	PHP_FE(enchant_broker_free, 			arginfo_enchant_broker_free)
 	PHP_FE(enchant_broker_get_error, 		arginfo_enchant_broker_free)

Modified: pecl/esmtp/trunk/esmtp-php4.c
===================================================================
--- pecl/esmtp/trunk/esmtp-php4.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/esmtp/trunk/esmtp-php4.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -139,7 +139,7 @@
 }
 /* }}} */

-function_entry esmtp_functions[] = {
+zend_function_entry esmtp_functions[] = {
     ZEND_FALIAS(esmtp_version,                  smtp_version,             NULL)
     ZEND_FALIAS(esmtp_errno,                    smtp_errno,               NULL)
     ZEND_FALIAS(esmtp_strerror,                 smtp_strerror,            NULL)

Modified: pecl/esmtp/trunk/esmtp.c
===================================================================
--- pecl/esmtp/trunk/esmtp.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/esmtp/trunk/esmtp.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -141,7 +141,7 @@
 }
 /* }}} */

-function_entry esmtp_functions[] = {
+zend_function_entry esmtp_functions[] = {
     ZEND_FALIAS(esmtp_version,                  smtp_version,             NULL)
     ZEND_FALIAS(esmtp_errno,                    smtp_errno,               NULL)
     ZEND_FALIAS(esmtp_strerror,                 smtp_strerror,            NULL)

Modified: pecl/event/trunk/event.c
===================================================================
--- pecl/event/trunk/event.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/event/trunk/event.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -44,7 +44,7 @@
 #define event_from_zval(e, z) ZEND_FETCH_RESOURCE(e, struct php_event*, &z, -1, "event", le_event);

 /* {{{ event_functions[] */
-function_entry event_functions[] = {
+zend_function_entry event_functions[] = {
 	PHP_FE(event_init, NULL)
 	PHP_FE(event_have_events, NULL)
 	PHP_FE(event_dispatch, NULL)

Modified: pecl/expect/trunk/expect.c
===================================================================
--- pecl/expect/trunk/expect.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/expect/trunk/expect.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -33,7 +33,7 @@
 ZEND_END_ARG_INFO()

 /* {{{ expect_functions[] */
-function_entry expect_functions[] = {
+zend_function_entry expect_functions[] = {
 	PHP_FE(expect_popen,    arginfo_expect_popen)
 	PHP_FE(expect_expectl,  arginfo_expect_expectl)
 	{ NULL, NULL, NULL }

Modified: pecl/fam/trunk/fam.c
===================================================================
--- pecl/fam/trunk/fam.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/fam/trunk/fam.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -41,7 +41,7 @@
  *
  * Every user visible function must have an entry in fam_functions[].
  */
-function_entry fam_functions[] = {
+zend_function_entry fam_functions[] = {
 	PHP_FE(fam_open,	NULL)
 	PHP_FE(fam_close,	NULL)
 	PHP_FE(fam_monitor_directory,	NULL)

Modified: pecl/ffi/trunk/ffi_library.c
===================================================================
--- pecl/ffi/trunk/ffi_library.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/ffi/trunk/ffi_library.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -224,7 +224,7 @@
 	parse_defs(obj, funcdefs);
 }

-function_entry php_ffi_context_funcs[] = {
+zend_function_entry php_ffi_context_funcs[] = {
 	{ "__construct", PHP_FN(php_ffi_context_create_instance), NULL },
 	{ NULL, NULL, NULL }
 };

Modified: pecl/ffi/trunk/php_ffi.c
===================================================================
--- pecl/ffi/trunk/php_ffi.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/ffi/trunk/php_ffi.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -41,7 +41,7 @@
  *
  * Every user visible function must have an entry in ffi_functions[].
  */
-function_entry ffi_functions[] = {
+zend_function_entry ffi_functions[] = {
 	{NULL, NULL, NULL}	/* Must be the last line in ffi_functions[] */
 };
 /* }}} */

Modified: pecl/ffi/trunk/php_ffi.h
===================================================================
--- pecl/ffi/trunk/php_ffi.h	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/ffi/trunk/php_ffi.h	2010-03-31 20:39:48 UTC (rev 297236)
@@ -52,8 +52,8 @@
 zend_object_value php_ffi_context_object_new(zend_class_entry *ce TSRMLS_DC);
 zend_object_value php_ffi_struct_object_new(zend_class_entry *ce TSRMLS_DC);
 extern zend_class_entry *php_ffi_struct_class_entry, *php_ffi_context_class_entry;
-extern function_entry php_ffi_struct_funcs[];
-extern function_entry php_ffi_context_funcs[];
+extern zend_function_entry php_ffi_struct_funcs[];
+extern zend_function_entry php_ffi_context_funcs[];

 /*
   	Declare any global variables you may need between the BEGIN

Modified: pecl/flitetts/trunk/flitetts.c
===================================================================
--- pecl/flitetts/trunk/flitetts.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/flitetts/trunk/flitetts.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -33,7 +33,7 @@

 cst_voice *register_cmu_us_kal();

-function_entry flitetts_functions[] = {
+zend_function_entry flitetts_functions[] = {
 	{NULL, NULL, NULL}	/* Must be the last line in flitetts_functions[] */
 };


Modified: pecl/freeimage/trunk/freeimage.c
===================================================================
--- pecl/freeimage/trunk/freeimage.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/freeimage/trunk/freeimage.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -134,7 +134,7 @@
  *
  * Every user visible function must have an entry in freeimage_functions[].
  */
-function_entry freeimage_functions[] = {
+zend_function_entry freeimage_functions[] = {
 	/* Bitmap management functions */
 	PHP_FE(freeimage_load,					NULL)
 	PHP_FE(freeimage_save,					NULL)

Modified: pecl/fribidi/trunk/fribidi.c
===================================================================
--- pecl/fribidi/trunk/fribidi.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/fribidi/trunk/fribidi.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -42,7 +42,7 @@
 #define FRIBIDI_CHARSET_CAP_RTL             FRIBIDI_CHAR_SET_CAP_RTL
 #endif

-function_entry fribidi_functions[] = {
+zend_function_entry fribidi_functions[] = {
 	PHP_FE(fribidi_log2vis,	     NULL)
 	PHP_FE(fribidi_charset_info, NULL)
 	PHP_FE(fribidi_get_charsets, NULL)

Modified: pecl/gdchart/trunk/gdchart.c
===================================================================
--- pecl/gdchart/trunk/gdchart.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/gdchart/trunk/gdchart.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -192,7 +192,7 @@
  *
  * Every user visible function must have an entry in gdchart_functions[].
  */
-function_entry gdchart_functions[] = {
+zend_function_entry gdchart_functions[] = {
 	{NULL, NULL, NULL}	/* Must be the last line in gdchart_functions[] */
 };
 /* }}} */

Modified: pecl/geoip/trunk/geoip.c
===================================================================
--- pecl/geoip/trunk/geoip.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/geoip/trunk/geoip.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -38,7 +38,7 @@
 static int le_geoip;

 /* {{{ */
-function_entry geoip_functions[] = {
+zend_function_entry geoip_functions[] = {
 	PHP_FE(geoip_database_info,   NULL)
 #define GEOIPDEF(php_func, c_func, db_type) \
 	PHP_FE(php_func,	NULL)

Modified: pecl/gmagick/trunk/gmagick.c
===================================================================
--- pecl/gmagick/trunk/gmagick.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/gmagick/trunk/gmagick.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -700,17 +700,17 @@
 	ZEND_ARG_INFO(0, adjoin)
 ZEND_END_ARG_INFO()

-/* {{{ static function_entry php_gmagick_functions[]
+/* {{{ static zend_function_entry php_gmagick_functions[]
 */
-static function_entry php_gmagick_functions[] =
+static zend_function_entry php_gmagick_functions[] =
 {
 	{ NULL, NULL, NULL }
 };
 /* }}} */

-/* {{{ static function_entry php_gmagick_functions[]
+/* {{{ static zend_function_entry php_gmagick_functions[]
 */
-static function_entry php_gmagick_class_methods[] =
+static zend_function_entry php_gmagick_class_methods[] =
 {
 	PHP_ME(gmagick,	__construct,		gmagick_constructor_args,	ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(gmagick, __tostring, 		gmagick_empty_args,		ZEND_ACC_PUBLIC)
@@ -979,7 +979,7 @@
 	ZEND_ARG_INFO(0, encoding)
 ZEND_END_ARG_INFO()

-static function_entry php_gmagickdraw_class_methods[] =
+static zend_function_entry php_gmagickdraw_class_methods[] =
 {
 	PHP_ME(gmagickdraw, setstrokecolor,	gmagickdraw_setstrokecolor_args,	ZEND_ACC_PUBLIC)
 	PHP_ME(gmagickdraw, setstrokewidth, gmagickdraw_setstrokewidth_args, ZEND_ACC_PUBLIC)
@@ -1044,9 +1044,9 @@
 	ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()

-/* {{{ static function_entry php_gmagickpixel_functions[]
+/* {{{ static zend_function_entry php_gmagickpixel_functions[]
 */
-static function_entry php_gmagickpixel_class_methods[] =
+static zend_function_entry php_gmagickpixel_class_methods[] =
 {
 	PHP_ME(gmagickpixel,	__construct,		gmagickpixel_constructor_args,	ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(gmagickpixel,	setcolor,		gmagickpixel_setcolor_args,		ZEND_ACC_PUBLIC)

Modified: pecl/hidef/trunk/frozenarray.c
===================================================================
--- pecl/hidef/trunk/frozenarray.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/hidef/trunk/frozenarray.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -306,7 +306,7 @@
 	ZEND_ARG_INFO(0, newval)
 ZEND_END_ARG_INFO()

-static function_entry frozen_array_functions[] = {
+static zend_function_entry frozen_array_functions[] = {
 	PHP_ME(FrozenArray, __construct,   NULL,              ZEND_ACC_PRIVATE|ZEND_ACC_FINAL)
 	PHP_ME(FrozenArray, offsetExists, arginfo_offsetGet, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
 	PHP_ME(FrozenArray, offsetGet,    arginfo_offsetGet, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)

Modified: pecl/html_parse/trunk/html_parse.c
===================================================================
--- pecl/html_parse/trunk/html_parse.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/html_parse/trunk/html_parse.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -148,7 +148,7 @@
 /* }}} */

 /* {{{ html_parse_functions[] */
-function_entry html_parse_functions[] = {
+zend_function_entry html_parse_functions[] = {
 	PHP_FE(html_parser_create  , html_parser_create_arg_info)
 	PHP_FE(html_parser_free    , html_parser_free_arg_info)
 	PHP_FE(html_parser_starttag_handler, html_parser_starttag_handler_arg_info)

Modified: pecl/htscanner/trunk/htscanner.c
===================================================================
--- pecl/htscanner/trunk/htscanner.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/htscanner/trunk/htscanner.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -271,7 +271,7 @@
 /* {{{ htscanner_functions[]
  *
  */
-function_entry htscanner_functions[] = {
+zend_function_entry htscanner_functions[] = {
 	{NULL, NULL, NULL}	/* Must be the last line in htscanner_functions[] */
 };
 /* }}} */

Modified: pecl/hyperwave/trunk/hw.c
===================================================================
--- pecl/hyperwave/trunk/hw.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/hyperwave/trunk/hw.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -52,7 +52,7 @@

 ZEND_DECLARE_MODULE_GLOBALS(hw);

-function_entry hw_functions[] = {
+zend_function_entry hw_functions[] = {
 	PHP_FE(hw_connect,								NULL)
 	PHP_FE(hw_pconnect,								NULL)
 	PHP_FE(hw_close,								NULL)

Modified: pecl/id3/trunk/id3.c
===================================================================
--- pecl/id3/trunk/id3.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/id3/trunk/id3.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -193,7 +193,7 @@
  *
  * Every user visible function must have an entry in id3_functions[].
  */
-function_entry id3_functions[] = {
+zend_function_entry id3_functions[] = {
 	PHP_FE(id3_get_version, NULL)
 	PHP_FE(id3_get_tag,	NULL)
 	PHP_FE(id3_set_tag, NULL)

Modified: pecl/idn/trunk/idn.c
===================================================================
--- pecl/idn/trunk/idn.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/idn/trunk/idn.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -218,7 +218,7 @@


 /* {{{ idn_functions[] */
-function_entry idn_functions[] = {
+zend_function_entry idn_functions[] = {
 	PHP_FE(idn_strerror, arginfo_idn_strerror)
 	PHP_FE(idn_to_ascii, arginfo_idn_to_ascii)
 	PHP_FE(idn_to_utf8,  arginfo_idn_to_utf8)

Modified: pecl/iisfunc/trunk/php_iisfunc.c
===================================================================
--- pecl/iisfunc/trunk/php_iisfunc.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/iisfunc/trunk/php_iisfunc.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -54,7 +54,7 @@
 	"Can't delete key!"
 };

-function_entry iisfunc_functions[] = {
+zend_function_entry iisfunc_functions[] = {
 	PHP_FE(iis_get_error,				NULL)
 	PHP_FE(iis_enum_servers,			NULL)
 	PHP_FE(iis_get_server_by_path,		NULL)

Modified: pecl/imagick/trunk/imagick.c
===================================================================
--- pecl/imagick/trunk/imagick.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/imagick/trunk/imagick.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -1691,12 +1691,12 @@
 		ZEND_ARG_INFO(0, row)
 	ZEND_END_ARG_INFO()

-static function_entry php_imagick_functions[] =
+static zend_function_entry php_imagick_functions[] =
 {
 	{ NULL, NULL, NULL }
 };

-static function_entry php_imagickdraw_class_methods[] =
+static zend_function_entry php_imagickdraw_class_methods[] =
 {
 #if MagickLibVersion > 0x628
 	PHP_ME(imagickdraw, resetvectorgraphics, imagickdraw_zero_args, ZEND_ACC_PUBLIC)
@@ -1826,7 +1826,7 @@
 	{ NULL, NULL, NULL }
 };

-static function_entry php_imagickpixeliterator_class_methods[] =
+static zend_function_entry php_imagickpixeliterator_class_methods[] =
 {
 	PHP_ME(imagickpixeliterator, __construct, imagickpixeliterator_construct_args, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(imagickpixeliterator, newpixeliterator, imagickpixeliterator_zero_args, ZEND_ACC_PUBLIC)
@@ -1854,7 +1854,7 @@
 };


-static function_entry php_imagickpixel_class_methods[] =
+static zend_function_entry php_imagickpixel_class_methods[] =
 {
 #if MagickLibVersion > 0x628
 	PHP_ME(imagickpixel, gethsl, imagickpixel_zero_args, ZEND_ACC_PUBLIC)
@@ -1879,7 +1879,7 @@
 	{ NULL, NULL, NULL }
 };

-static function_entry php_imagick_class_methods[] =
+static zend_function_entry php_imagick_class_methods[] =
 {
 #if MagickLibVersion > 0x628
 	PHP_ME(imagick, optimizeimagelayers, imagick_zero_args, ZEND_ACC_PUBLIC)

Modified: pecl/ims/trunk/php_ims_connect.c
===================================================================
--- pecl/ims/trunk/php_ims_connect.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/ims/trunk/php_ims_connect.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -108,7 +108,7 @@

 ZEND_DECLARE_MODULE_GLOBALS(ims_connect)

-static function_entry ims_connect_functions[] = {
+static zend_function_entry ims_connect_functions[] = {
 	PHP_FE(ims_connect, NULL)
 	PHP_FE(ims_wrap_message, NULL)
 	PHP_FE(ims_unwrap_message, NULL)

Modified: pecl/ingres/trunk/ingres.c
===================================================================
--- pecl/ingres/trunk/ingres.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/ingres/trunk/ingres.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -187,7 +187,7 @@
 /* {{{ Ingres module function list
  * Every user visible function must have an entry in ingres_functions[].
 */
-function_entry ingres_functions[] = {
+zend_function_entry ingres_functions[] = {
 #if defined(HAVE_INGRES2)
     PHP_FE(ingres2_connect,		        arginfo_ingres_connect)
     PHP_FE(ingres2_pconnect,		    arginfo_ingres_pconnect)

Modified: pecl/intercept/trunk/intercept.c
===================================================================
--- pecl/intercept/trunk/intercept.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/intercept/trunk/intercept.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -42,7 +42,7 @@
  *
  * Every user visible function must have an entry in intercept_functions[].
  */
-function_entry intercept_functions[] = {
+zend_function_entry intercept_functions[] = {
 	PHP_FE(intercept_add,	NULL)
 	{NULL, NULL, NULL}
 };

Modified: pecl/intl/trunk/collator/collator_class.c
===================================================================
--- pecl/intl/trunk/collator/collator_class.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/intl/trunk/collator/collator_class.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -115,7 +115,7 @@
  * Every 'Collator' class method has an entry in this table
  */

-function_entry Collator_class_functions[] = {
+zend_function_entry Collator_class_functions[] = {
 	PHP_ME( Collator, __construct, collator_1_arg, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR )
 	ZEND_FENTRY( create, ZEND_FN( collator_create ), collator_1_arg, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC )
 	PHP_NAMED_FE( compare, ZEND_FN( collator_compare ), collator_2_args )

Modified: pecl/intl/trunk/dateformat/dateformat_class.c
===================================================================
--- pecl/intl/trunk/dateformat/dateformat_class.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/intl/trunk/dateformat/dateformat_class.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -87,7 +87,7 @@
  * Every 'IntlDateFormatter' class method has an entry in this table
  */

-static function_entry IntlDateFormatter_class_functions[] = {
+static zend_function_entry IntlDateFormatter_class_functions[] = {
 	PHP_ME( IntlDateFormatter, __construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR )
 	ZEND_FENTRY(  create, ZEND_FN( datefmt_create ), NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC )
 	PHP_NAMED_FE( getDateType, ZEND_FN( datefmt_get_datetype ), NULL )

Modified: pecl/intl/trunk/formatter/formatter_class.c
===================================================================
--- pecl/intl/trunk/formatter/formatter_class.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/intl/trunk/formatter/formatter_class.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -94,7 +94,7 @@
 	ZEND_ARG_INFO( 1, position )
 ZEND_END_ARG_INFO()

-static function_entry NumberFormatter_class_functions[] = {
+static zend_function_entry NumberFormatter_class_functions[] = {
 	PHP_ME( NumberFormatter, __construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR )
 	ZEND_FENTRY( create, ZEND_FN( numfmt_create ), NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC )
 	PHP_NAMED_FE( format, ZEND_FN( numfmt_format ), NULL )

Modified: pecl/intl/trunk/locale/locale_class.c
===================================================================
--- pecl/intl/trunk/locale/locale_class.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/intl/trunk/locale/locale_class.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -71,7 +71,7 @@
  * Every 'Locale' class method has an entry in this table
  */

-function_entry Locale_class_functions[] = {
+zend_function_entry Locale_class_functions[] = {
 	ZEND_FENTRY( getDefault, zif_locale_get_default , locale_0_args , ZEND_ACC_PUBLIC|ZEND_ACC_STATIC  )
 	ZEND_FENTRY( setDefault, zif_locale_set_default , locale_1_arg , ZEND_ACC_PUBLIC|ZEND_ACC_STATIC )
 	ZEND_FENTRY( getPrimaryLanguage, ZEND_FN( locale_get_primary_language ), locale_1_arg , ZEND_ACC_PUBLIC|ZEND_ACC_STATIC )

Modified: pecl/intl/trunk/msgformat/msgformat_class.c
===================================================================
--- pecl/intl/trunk/msgformat/msgformat_class.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/intl/trunk/msgformat/msgformat_class.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -80,7 +80,7 @@
  * Every 'MessageFormatter' class method has an entry in this table
  */

-static function_entry MessageFormatter_class_functions[] = {
+static zend_function_entry MessageFormatter_class_functions[] = {
 	PHP_ME( MessageFormatter, __construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR )
 	ZEND_FENTRY(  create, ZEND_FN( msgfmt_create ), NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC )
 	PHP_NAMED_FE( format, ZEND_FN( msgfmt_format ), NULL )

Modified: pecl/intl/trunk/normalizer/normalizer_class.c
===================================================================
--- pecl/intl/trunk/normalizer/normalizer_class.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/intl/trunk/normalizer/normalizer_class.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -42,7 +42,7 @@
  * Every 'Normalizer' class method has an entry in this table
  */

-function_entry Normalizer_class_functions[] = {
+zend_function_entry Normalizer_class_functions[] = {
 	ZEND_FENTRY( normalize, ZEND_FN( normalizer_normalize ), normalizer_3_args, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC )
 	ZEND_FENTRY( isNormalized, ZEND_FN( normalizer_is_normalized ), normalizer_3_args, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC )
 	{ NULL, NULL, NULL }

Modified: pecl/ixsfunc/trunk/php_ixsfunc.c
===================================================================
--- pecl/ixsfunc/trunk/php_ixsfunc.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/ixsfunc/trunk/php_ixsfunc.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -30,7 +30,7 @@
 long CreateScope(char *strCatalogName, char *strPath, char *strConnectAs);
 long RemoveScope(char *strCatalogName, char *strPath);

-function_entry ixsfunc_functions[] =
+zend_function_entry ixsfunc_functions[] =
 {
 	PHP_FE(ixs_catalog_exists,			NULL)
 	PHP_FE(ixs_create_catalog,			NULL)

Modified: pecl/kadm5/trunk/kadm5.c
===================================================================
--- pecl/kadm5/trunk/kadm5.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/kadm5/trunk/kadm5.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -74,7 +74,7 @@
  *
  * Every user visible function must have an entry in kadm5_functions[].
  */
-function_entry kadm5_functions[] = {
+zend_function_entry kadm5_functions[] = {
     PHP_FE(kadm5_init_with_password, NULL)
     PHP_FE(kadm5_destroy, NULL)
     PHP_FE(kadm5_flush, NULL)

Modified: pecl/kakasi/trunk/kakasi.c
===================================================================
--- pecl/kakasi/trunk/kakasi.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/kakasi/trunk/kakasi.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -50,7 +50,7 @@
 /* static char *php_kakasi_argv_wakati[] = {"kakasi", "-w", "-isjis", "-osjis"}; */
 static const int php_kakasi_argn_wakati = sizeof(php_kakasi_argv_wakati)/sizeof(char*);

-function_entry kakasi_functions[] = {
+zend_function_entry kakasi_functions[] = {
 	PHP_FE(kakasi,	NULL)
 	PHP_FE(kakasi_asort,	first_arg_force_ref)
 	PHP_FE(kakasi_arsort,	first_arg_force_ref)

Modified: pecl/ktaglib/trunk/ktaglib.cpp
===================================================================
--- pecl/ktaglib/trunk/ktaglib.cpp	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/ktaglib/trunk/ktaglib.cpp	2010-03-31 20:39:48 UTC (rev 297236)
@@ -238,7 +238,7 @@
 /* }}} */

 /* {{{ ktaglib_functions[] */
-function_entry ktaglib_functions[] = {
+zend_function_entry ktaglib_functions[] = {
 	{ NULL, NULL, NULL }
 };
 /* }}} */

Modified: pecl/lchash/trunk/lchash.c
===================================================================
--- pecl/lchash/trunk/lchash.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/lchash/trunk/lchash.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -35,7 +35,7 @@

 /* {{{ lchash_functions[]
  */
-function_entry lchash_functions[] = {
+zend_function_entry lchash_functions[] = {
 	PHP_FE(lchash_create,	NULL)
 	PHP_FE(lchash_destroy,	NULL)
 	PHP_FE(lchash_insert,	NULL)

Modified: pecl/libevent/trunk/libevent.c
===================================================================
--- pecl/libevent/trunk/libevent.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/libevent/trunk/libevent.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -1372,7 +1372,7 @@
 #else
 /* {{{ libevent_functions[]
  */
-function_entry libevent_functions[] = {
+zend_function_entry libevent_functions[] = {
 	PHP_FE(event_base_new, 				NULL)
 	PHP_FE(event_base_free, 			NULL)
 	PHP_FE(event_base_loop, 			NULL)

Modified: pecl/libexif/trunk/libexif.c
===================================================================
--- pecl/libexif/trunk/libexif.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/libexif/trunk/libexif.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -40,7 +40,7 @@
 	exif_entry_free(resource);
 }
 /* {{{ libexif_functions[] */
-function_entry libexif_functions[] = {
+zend_function_entry libexif_functions[] = {
 	PHP_FE(exif_data_new_from_file, NULL)
 	PHP_FE(exif_data_get_entry , NULL)
 	PHP_FE(exif_entry_get_value, NULL)

Modified: pecl/llvm/trunk/phpllvm.cpp
===================================================================
--- pecl/llvm/trunk/phpllvm.cpp	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/llvm/trunk/phpllvm.cpp	2010-03-31 20:39:48 UTC (rev 297236)
@@ -103,7 +103,7 @@
 	DISPLAY_INI_ENTRIES();
 }

-static function_entry phpllvm_functions[] = {
+static zend_function_entry phpllvm_functions[] = {
 	{NULL, NULL, NULL}
 };


Modified: pecl/lzf/trunk/lzf.c
===================================================================
--- pecl/lzf/trunk/lzf.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/lzf/trunk/lzf.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -37,7 +37,7 @@
 *
 * Every user visible function must have an entry in lzf_functions[].
 */
-function_entry lzf_functions[] = {
+zend_function_entry lzf_functions[] = {
 	PHP_FE(lzf_compress,		NULL)
 	PHP_FE(lzf_decompress,		NULL)
 	PHP_FE(lzf_optimized_for,	NULL)

Modified: pecl/mailparse/trunk/mailparse.c
===================================================================
--- pecl/mailparse/trunk/mailparse.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/mailparse/trunk/mailparse.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -56,7 +56,7 @@
 static int le_mime_part;


-static function_entry mimemessage_methods[] = {
+static zend_function_entry mimemessage_methods[] = {
 	PHP_NAMED_FE(mimemessage,			PHP_FN(mailparse_mimemessage),					NULL)
 	PHP_NAMED_FE(get_child,				PHP_FN(mailparse_mimemessage_get_child),		NULL)
 	PHP_NAMED_FE(get_child_count,		PHP_FN(mailparse_mimemessage_get_child_count),	NULL)
@@ -72,7 +72,7 @@

 static zend_class_entry *mimemsg_class_entry;

-function_entry mailparse_functions[] = {
+zend_function_entry mailparse_functions[] = {
 	PHP_FE(mailparse_msg_parse_file,			NULL)
 	PHP_FE(mailparse_msg_get_part,				NULL)
 	PHP_FE(mailparse_msg_get_structure,			NULL)

Modified: pecl/markdown/trunk/markdown.c
===================================================================
--- pecl/markdown/trunk/markdown.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/markdown/trunk/markdown.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -470,7 +470,7 @@
  *
  * Every user visible function must have an entry in markdown_functions[].
  */
-function_entry markdown_functions[] = {
+zend_function_entry markdown_functions[] = {
 	{NULL, NULL, NULL}	/* Must be the last line in markdown_functions[] */
 };
 /* }}} */

Modified: pecl/maxdb/trunk/php_maxdb.c
===================================================================
--- pecl/maxdb/trunk/php_maxdb.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/maxdb/trunk/php_maxdb.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -332,7 +332,7 @@
  *
  * Every user visible function must have an entry in maxdb_functions[].
  */
-function_entry maxdb_link_methods[] = {
+zend_function_entry maxdb_link_methods[] = {
 	PHP_FALIAS(autocommit,maxdb_autocommit,NULL)
 	PHP_FALIAS(change_user,maxdb_change_user,NULL)
 	PHP_FALIAS(character_set_name,maxdb_character_set_name,NULL)
@@ -383,7 +383,7 @@
  *
  * Every user visible function must have an entry in maxdb_result_functions[].
  */
-function_entry maxdb_result_methods[] = {
+zend_function_entry maxdb_result_methods[] = {
 	PHP_FALIAS(close,maxdb_free_result,NULL)
 	PHP_FALIAS(free,maxdb_free_result,NULL)
 	PHP_FALIAS(data_seek,maxdb_data_seek,NULL)
@@ -405,7 +405,7 @@
  *
  * Every user visible function must have an entry in maxdb_stmt_functions[].
  */
-function_entry maxdb_stmt_methods[] = {
+zend_function_entry maxdb_stmt_methods[] = {
 	/* PHP_FALIAS(attr_get,maxdb_stmt_attr_get,NULL)
        PHP_FALIAS(attr_set,maxdb_stmt_attr_set,NULL) */
 	PHP_FALIAS(bind_param,maxdb_stmt_bind_param,second_arg_force_by_ref_rest)
@@ -481,7 +481,7 @@
  *
  * Every user visible function must have an entry in maxdb_functions[].
  */
-function_entry maxdb_functions[] = {
+zend_function_entry maxdb_functions[] = {
     PHP_FE(maxdb_debug, NULL)
 	PHP_FE(maxdb_enable_reads_from_master, NULL)
 	PHP_FE(maxdb_disable_reads_from_master, NULL)

Modified: pecl/mcal/trunk/php_mcal.c
===================================================================
--- pecl/mcal/trunk/php_mcal.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/mcal/trunk/php_mcal.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -67,7 +67,7 @@
  * {"PHPScriptFunctionName",dllFunctionName,1}
  */

-function_entry mcal_functions[] = {
+zend_function_entry mcal_functions[] = {
 	PHP_FE(mcal_open,NULL)
 	PHP_FE(mcal_close,NULL)
 	PHP_FE(mcal_popen,NULL)

Modified: pecl/mcve/trunk/mcve.c
===================================================================
--- pecl/mcve/trunk/mcve.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/mcve/trunk/mcve.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -67,7 +67,7 @@
 /* }}} */

 /* {{{ extension definition structures */
-function_entry mcve_functions[] = {
+zend_function_entry mcve_functions[] = {
 	PHP_FE(m_initengine,			NULL)
 	PHP_FE(m_initconn,			NULL)
 	PHP_FE(m_deleteresponse,		NULL)

Modified: pecl/mdbtools/trunk/mdbtools.c
===================================================================
--- pecl/mdbtools/trunk/mdbtools.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/mdbtools/trunk/mdbtools.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -62,7 +62,7 @@
 /* }}} */

 /* {{{ mdbtools_functions[] */
-function_entry mdbtools_functions[] = {
+zend_function_entry mdbtools_functions[] = {
 	PHP_FE(mdb_open            , mdb_open_arg_info)
 	PHP_FE(mdb_close           , mdb_close_arg_info)
 	PHP_FE(mdb_version         , mdb_version_arg_info)

Modified: pecl/mnogosearch/trunk/php_mnogo.c
===================================================================
--- pecl/mnogosearch/trunk/php_mnogo.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/mnogosearch/trunk/php_mnogo.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -151,7 +151,7 @@

 /* {{{ mnogosearch_functions[]
  */
-function_entry mnogosearch_functions[] = {
+zend_function_entry mnogosearch_functions[] = {
 	PHP_FE(udm_api_version,		NULL)

 #if UDM_VERSION_ID >= 30200

Modified: pecl/mongo/trunk/collection.c
===================================================================
--- pecl/mongo/trunk/collection.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/mongo/trunk/collection.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -944,7 +944,7 @@
 /* }}} */


-static function_entry MongoCollection_methods[] = {
+static zend_function_entry MongoCollection_methods[] = {
   PHP_ME(MongoCollection, __construct, NULL, ZEND_ACC_PUBLIC)
   PHP_ME(MongoCollection, __toString, NULL, ZEND_ACC_PUBLIC)
   PHP_ME(MongoCollection, __get, arginfo___get, ZEND_ACC_PUBLIC)

Modified: pecl/mongo/trunk/cursor.c
===================================================================
--- pecl/mongo/trunk/cursor.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/mongo/trunk/cursor.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -638,7 +638,7 @@
   zval_ptr_dtor(&db);
 }

-static function_entry MongoCursor_methods[] = {
+static zend_function_entry MongoCursor_methods[] = {
   PHP_ME(MongoCursor, __construct, NULL, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC)
   PHP_ME(MongoCursor, hasNext, NULL, ZEND_ACC_PUBLIC)
   PHP_ME(MongoCursor, getNext, NULL, ZEND_ACC_PUBLIC)

Modified: pecl/mongo/trunk/db.c
===================================================================
--- pecl/mongo/trunk/db.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/mongo/trunk/db.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -588,7 +588,7 @@



-static function_entry MongoDB_methods[] = {
+static zend_function_entry MongoDB_methods[] = {
   PHP_ME(MongoDB, __construct, NULL, ZEND_ACC_PUBLIC)
   PHP_ME(MongoDB, __toString, NULL, ZEND_ACC_PUBLIC)
   PHP_ME(MongoDB, __get, arginfo___get, ZEND_ACC_PUBLIC)

Modified: pecl/mongo/trunk/gridfs.c
===================================================================
--- pecl/mongo/trunk/gridfs.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/mongo/trunk/gridfs.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -630,7 +630,7 @@
 }


-static function_entry MongoGridFS_methods[] = {
+static zend_function_entry MongoGridFS_methods[] = {
   PHP_ME(MongoGridFS, __construct, NULL, ZEND_ACC_PUBLIC)
   PHP_ME(MongoGridFS, drop, NULL, ZEND_ACC_PUBLIC)
   PHP_ME(MongoGridFS, find, NULL, ZEND_ACC_PUBLIC)
@@ -883,7 +883,7 @@
   return total;
 }

-static function_entry MongoGridFSFile_methods[] = {
+static zend_function_entry MongoGridFSFile_methods[] = {
   PHP_ME(MongoGridFSFile, __construct, NULL, ZEND_ACC_PUBLIC)
   PHP_ME(MongoGridFSFile, getFilename, NULL, ZEND_ACC_PUBLIC)
   PHP_ME(MongoGridFSFile, getSize, NULL, ZEND_ACC_PUBLIC)
@@ -955,7 +955,7 @@
 }


-static function_entry MongoGridFSCursor_methods[] = {
+static zend_function_entry MongoGridFSCursor_methods[] = {
   PHP_ME(MongoGridFSCursor, __construct, NULL, ZEND_ACC_PUBLIC)
   PHP_ME(MongoGridFSCursor, getNext, NULL, ZEND_ACC_PUBLIC)
   PHP_ME(MongoGridFSCursor, current, NULL, ZEND_ACC_PUBLIC)

Modified: pecl/mongo/trunk/mongo.c
===================================================================
--- pecl/mongo/trunk/mongo.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/mongo/trunk/mongo.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -109,13 +109,13 @@
 ZEND_END_ARG_INFO()


-function_entry mongo_functions[] = {
+zend_function_entry mongo_functions[] = {
   PHP_FE(bson_encode, NULL)
   PHP_FE(bson_decode, NULL)
   { NULL, NULL, NULL }
 };

-static function_entry mongo_methods[] = {
+static zend_function_entry mongo_methods[] = {
   PHP_ME(Mongo, __construct, NULL, ZEND_ACC_PUBLIC)
   PHP_ME(Mongo, connect, NULL, ZEND_ACC_PUBLIC)
   PHP_ME(Mongo, pairConnect, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED)

Modified: pecl/mongo/trunk/mongo_types.c
===================================================================
--- pecl/mongo/trunk/mongo_types.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/mongo/trunk/mongo_types.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -141,7 +141,7 @@
   php_mongo_obj_new(mongo_id);
 }

-static function_entry MongoId_methods[] = {
+static zend_function_entry MongoId_methods[] = {
   PHP_ME(MongoId, __construct, NULL, ZEND_ACC_PUBLIC)
   PHP_ME(MongoId, __toString, NULL, ZEND_ACC_PUBLIC)
   PHP_ME(MongoId, getTimestamp, NULL, ZEND_ACC_PUBLIC)
@@ -295,7 +295,7 @@



-static function_entry MongoDate_methods[] = {
+static zend_function_entry MongoDate_methods[] = {
   PHP_ME(MongoDate, __construct, NULL, ZEND_ACC_PUBLIC)
   PHP_ME(MongoDate, __toString, NULL, ZEND_ACC_PUBLIC)
   { NULL, NULL, NULL }
@@ -341,7 +341,7 @@
 /* }}} */


-static function_entry MongoBinData_methods[] = {
+static zend_function_entry MongoBinData_methods[] = {
   PHP_ME(MongoBinData, __construct, NULL, ZEND_ACC_PUBLIC)
   PHP_ME(MongoBinData, __toString, NULL, ZEND_ACC_PUBLIC)
   { NULL, NULL, NULL }
@@ -431,7 +431,7 @@
 /* }}} */


-static function_entry MongoRegex_methods[] = {
+static zend_function_entry MongoRegex_methods[] = {
   PHP_ME(MongoRegex, __construct, NULL, ZEND_ACC_PUBLIC)
   PHP_ME(MongoRegex, __toString, NULL, ZEND_ACC_PUBLIC)
   { NULL, NULL, NULL }
@@ -486,7 +486,7 @@
 /* }}} */


-static function_entry MongoCode_methods[] = {
+static zend_function_entry MongoCode_methods[] = {
   PHP_ME(MongoCode, __construct, NULL, ZEND_ACC_PUBLIC )
   PHP_ME(MongoCode, __toString, NULL, ZEND_ACC_PUBLIC )
   { NULL, NULL, NULL }
@@ -632,7 +632,7 @@
 }
 /* }}} */

-static function_entry MongoDBRef_methods[] = {
+static zend_function_entry MongoDBRef_methods[] = {
   PHP_ME(MongoDBRef, create, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
   PHP_ME(MongoDBRef, isRef, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
   PHP_ME(MongoDBRef, get, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
@@ -650,7 +650,7 @@
   zend_declare_property_string(mongo_ce_DBRef, "idKey", strlen("idKey"), "$id", ZEND_ACC_PROTECTED|ZEND_ACC_STATIC TSRMLS_CC);
 }

-static function_entry MongoTimestamp_methods[] = {
+static zend_function_entry MongoTimestamp_methods[] = {
   PHP_ME(MongoTimestamp, __construct, NULL, ZEND_ACC_PUBLIC)
   PHP_ME(MongoTimestamp, __toString, NULL, ZEND_ACC_PUBLIC)
   { NULL, NULL, NULL }

Modified: pecl/mqseries/trunk/mqseries.c
===================================================================
--- pecl/mqseries/trunk/mqseries.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/mqseries/trunk/mqseries.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -230,7 +230,7 @@
  *
  * Every user visible function must have an entry in mqseries_functions[].
  */
-function_entry mqseries_functions[] = {
+zend_function_entry mqseries_functions[] = {
 	PHP_FE(mqseries_back,	arginfo_mqseries_back)
 	PHP_FE(mqseries_begin,	arginfo_mqseries_begin)
 	PHP_FE(mqseries_close,	arginfo_mqseries_close)

Modified: pecl/msession/trunk/msession.c
===================================================================
--- pecl/msession/trunk/msession.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/msession/trunk/msession.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -137,7 +137,7 @@
 #define MAX_HOST	1024
 #define DEF_PORT	8086

-function_entry msession_functions[] = {
+zend_function_entry msession_functions[] = {
 	PHP_FE(msession_connect,NULL)
 	PHP_FE(msession_disconnect,NULL)
 	PHP_FE(msession_lock,NULL)

Modified: pecl/namazu/trunk/php_namazu.c
===================================================================
--- pecl/namazu/trunk/php_namazu.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/namazu/trunk/php_namazu.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -51,7 +51,7 @@
 #define php_namazu_unlock()
 #endif

-function_entry namazu_functions[] = {
+zend_function_entry namazu_functions[] = {
 	PHP_FE(nmz_set_maxhit,		NULL)
 	PHP_FE(nmz_get_maxhit,		NULL)
 	PHP_FE(nmz_set_maxmatch,		NULL)

Modified: pecl/netools/trunk/netools.c
===================================================================
--- pecl/netools/trunk/netools.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/netools/trunk/netools.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -34,7 +34,7 @@

 /* {{{ netools_functions[] */
 /* only general functions here, not class methods */
-function_entry netools_functions[] = {
+zend_function_entry netools_functions[] = {
 	PHP_FE(netools_device_enum, NULL)
 	PHP_FE(netools_ip_to_mac, NULL)
 	PHP_FE(netools_hostname_to_mac, NULL)

Modified: pecl/newt/trunk/newt.c
===================================================================
--- pecl/newt/trunk/newt.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/newt/trunk/newt.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -86,7 +86,7 @@

 /* {{{ newt_functions[]
  */
-function_entry newt_functions[] = {
+zend_function_entry newt_functions[] = {
 	PHP_FE(newt_init,							NULL)
 	PHP_FE(newt_finished,						NULL)
 	PHP_FE(newt_cls,							NULL)

Modified: pecl/notes/trunk/php_notes.c
===================================================================
--- pecl/notes/trunk/php_notes.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/notes/trunk/php_notes.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -88,7 +88,7 @@

 #define  STRING_LENGTH  256

-function_entry notes_functions[] = {
+zend_function_entry notes_functions[] = {
 	PHP_FE(notes_create_db,										NULL)
 	PHP_FE(notes_drop_db,										NULL)
 	PHP_FE(notes_version,										NULL)

Modified: pecl/ntuser/trunk/php_ntuser.c
===================================================================
--- pecl/ntuser/trunk/php_ntuser.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/ntuser/trunk/php_ntuser.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -21,7 +21,7 @@
 #include "php_ntuser.h"
 #include <ext/standard/info.h>

-function_entry ntuser_functions[] =
+zend_function_entry ntuser_functions[] =
 {
 	PHP_FE(ntuser_getuserlist,			NULL)
 	PHP_FE(ntuser_getusergroups,		NULL)

Modified: pecl/openal/trunk/php_openal.c
===================================================================
--- pecl/openal/trunk/php_openal.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/openal/trunk/php_openal.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -782,7 +782,7 @@
 	}
 }

-function_entry openal_functions[] = {
+zend_function_entry openal_functions[] = {
 	PHP_FE(openal_device_open,		NULL)
 	PHP_FE(openal_device_close,		NULL)
 	PHP_FE(openal_context_create,	NULL)

Modified: pecl/optimizer/trunk/php_optimizer.c
===================================================================
--- pecl/optimizer/trunk/php_optimizer.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/optimizer/trunk/php_optimizer.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -92,7 +92,7 @@

 /* {{{ optimizer_functions[]
  */
-function_entry optimizer_functions[] = {
+zend_function_entry optimizer_functions[] = {
 	{NULL, NULL, NULL}
 };
 /* }}} */

Modified: pecl/oracle/trunk/oracle.c
===================================================================
--- pecl/oracle/trunk/oracle.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/oracle/trunk/oracle.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -117,7 +117,7 @@

 /* {{{ oracle_functions[]
  */
-function_entry oracle_functions[] = {
+zend_function_entry oracle_functions[] = {
 	PHP_FE(ora_bind,								NULL)
 	PHP_FE(ora_close,								NULL)
 	PHP_FE(ora_commit,								NULL)

Modified: pecl/ovrimos/trunk/ovrimos.c
===================================================================
--- pecl/ovrimos/trunk/ovrimos.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/ovrimos/trunk/ovrimos.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -1238,7 +1238,7 @@

 /* {{{ ovrimos_functions[]
  */
-function_entry ovrimos_functions[] = {
+zend_function_entry ovrimos_functions[] = {
 /*     PHP_FE(ovrimos_setoption, NULL)*/
 /*     PHP_FE(ovrimos_autocommit, NULL)*/
 	PHP_FE(ovrimos_close, NULL)

Modified: pecl/paradox/trunk/paradox.c
===================================================================
--- pecl/paradox/trunk/paradox.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/paradox/trunk/paradox.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -48,7 +48,7 @@
  *
  * Every user visible function must have an entry in paradox_functions[].
  */
-function_entry paradox_functions[] = {
+zend_function_entry paradox_functions[] = {
 	PHP_FE(px_new, NULL)
 	PHP_FE(px_open_fp, NULL)
 	PHP_FE(px_create_fp, NULL)
@@ -89,7 +89,7 @@
 };
 /* }}} */

-function_entry paradox_funcs_db[] = {
+zend_function_entry paradox_funcs_db[] = {
 	PHP_ME_MAPPING(__construct, px_new, NULL, 0)
 	PHP_ME_MAPPING(open_fp, px_open_fp, NULL, 0)
 	PHP_ME_MAPPING(create_fp, px_create_fp, NULL, 0)

Modified: pecl/parse_tree/trunk/parse_tree.c
===================================================================
--- pecl/parse_tree/trunk/parse_tree.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/parse_tree/trunk/parse_tree.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -19,7 +19,7 @@
 #if HAVE_PARSE_TREE

 /* {{{ parse_tree_functions[] */
-function_entry parse_tree_functions[] = {
+zend_function_entry parse_tree_functions[] = {
 	PHP_FE(parse_tree_from_file, NULL)
 	{ NULL, NULL, NULL }
 };

Modified: pecl/parsekit/trunk/parsekit.c
===================================================================
--- pecl/parsekit/trunk/parsekit.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/parsekit/trunk/parsekit.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -1130,8 +1130,8 @@
 static unsigned char php_parsekit_second_arg_force_ref[] = { 3, BYREF_NONE, BYREF_FORCE };
 #endif

-/* {{{ function_entry */
-function_entry parsekit_functions[] = {
+/* {{{ zend_function_entry */
+zend_function_entry parsekit_functions[] = {
 	PHP_FE(parsekit_compile_string,			php_parsekit_second_arg_force_ref)
 	PHP_FE(parsekit_compile_file,			php_parsekit_second_arg_force_ref)
 	PHP_FE(parsekit_opcode_flags,			NULL)

Modified: pecl/pdf/trunk/pdf.c
===================================================================
--- pecl/pdf/trunk/pdf.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/pdf/trunk/pdf.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -132,7 +132,7 @@

 static int le_pdf;

-function_entry pdf_functions[] = {
+zend_function_entry pdf_functions[] = {
 #if PDFLIB_MAJORVERSION >= 6
     PHP_FE(pdf_activate_item, NULL)
 #endif /* PDFlib >= 6.0.0 */
@@ -335,7 +335,7 @@
     PDF *p;
 } pdflib_object;

-function_entry pdflib_funcs[] = {
+zend_function_entry pdflib_funcs[] = {
 #if PDFLIB_MAJORVERSION >= 6
     PDF_ME_MAPPING(activate_item, pdf_activate_item, NULL)
 #endif /* PDFlib >= 6.0.0 */

Modified: pecl/pdf/trunk/pdf4.c
===================================================================
--- pecl/pdf/trunk/pdf4.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/pdf/trunk/pdf4.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -83,7 +83,7 @@

 /* {{{ pdf_functions[]
  */
-function_entry pdf_functions[] = {
+zend_function_entry pdf_functions[] = {
 	PHP_FE(pdf_new, NULL)		/* new function */
 	PHP_FE(pdf_delete, NULL)	/* new function */
 	PHP_FE(pdf_open_file, NULL)	/* new function */

Modified: pecl/pdf/trunk/pdf7.c
===================================================================
--- pecl/pdf/trunk/pdf7.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/pdf/trunk/pdf7.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -18,7 +18,7 @@

 static int le_pdf;

-function_entry pdf_functions[] = {
+zend_function_entry pdf_functions[] = {
 #define _WRAP_FUNCTION_ENTRY
 #include "php_wrapped.c"
 #undef _WRAP_FUNCTION_ENTRY
@@ -63,7 +63,7 @@
     PDF *p;
 } pdflib_object;

-function_entry pdflib_funcs[] = {
+zend_function_entry pdflib_funcs[] = {
 #define _WRAP_FUNCTION_ENTRY2
 #include "php_wrapped.c"
 #undef _WRAP_FUNCTION_ENTRY2

Modified: pecl/pdo_4d/trunk/pdo_4d.c
===================================================================
--- pecl/pdo_4d/trunk/pdo_4d.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/pdo_4d/trunk/pdo_4d.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -49,7 +49,7 @@
 };
 /* }}} */
 /* {{{ pdo_4d_functions[] */
-function_entry pdo_4d_functions[] = {
+zend_function_entry pdo_4d_functions[] = {
 	{ NULL, NULL, NULL }
 };
 /* }}} */

Modified: pecl/pfpro/trunk/pfpro.c
===================================================================
--- pecl/pfpro/trunk/pfpro.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/pfpro/trunk/pfpro.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -40,7 +40,7 @@
 /* }}} */

 /* {{{ Function table */
-function_entry pfpro_functions[] = {
+zend_function_entry pfpro_functions[] = {
 	PHP_FE(pfpro_version, NULL)
 	PHP_FE(pfpro_init, NULL)
 	PHP_FE(pfpro_cleanup, NULL)

Modified: pecl/phar/trunk/phar.c
===================================================================
--- pecl/phar/trunk/phar.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/phar/trunk/phar.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -3289,7 +3289,7 @@
  *
  * Every user visible function must have an entry in phar_functions[].
  */
-function_entry phar_functions[] = {
+zend_function_entry phar_functions[] = {
 	{NULL, NULL, NULL} /* Must be the last line in phar_functions[] */
 };
 /* }}}*/

Modified: pecl/philter/trunk/philter.c
===================================================================
--- pecl/philter/trunk/philter.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/philter/trunk/philter.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -206,7 +206,7 @@
 	g->index = 0;
 }

-function_entry philter_functions[] = {
+zend_function_entry philter_functions[] = {
 	PHP_FE(philter_encode, NULL)
 	{NULL, NULL, NULL}
 };

Modified: pecl/phpdoc/trunk/phpdoc.c
===================================================================
--- pecl/phpdoc/trunk/phpdoc.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/phpdoc/trunk/phpdoc.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -114,7 +114,7 @@

 /* Every user visible function must have an entry in phpdoc_functions[].
 */
-function_entry phpdoc_functions[] = {
+zend_function_entry phpdoc_functions[] = {
 	PHP_FE(confirm_phpdoc_compiled,	NULL)		/* For testing, remove later. */
 	PHP_FE(phpdoc_xml_from_string, NULL)
 	{NULL, NULL, NULL}	/* Must be the last line in phpdoc_functions[] */

Modified: pecl/picosql/trunk/picosql_wrap.cpp
===================================================================
--- pecl/picosql/trunk/picosql_wrap.cpp	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/picosql/trunk/picosql_wrap.cpp	2010-03-31 20:39:48 UTC (rev 297236)
@@ -481,7 +481,7 @@

 /* entry subsection */
 /* Every non-class user visible function must have an entry here */
-function_entry picosql_functions[] = {
+zend_function_entry picosql_functions[] = {
 	ZEND_NAMED_FE(taghkey_fp_set,
 		_wrap_tagHKEY_fp_set, NULL)
 	ZEND_NAMED_FE(taghkey_fp_get,

Modified: pecl/pop3/trunk/pop3.c
===================================================================
--- pecl/pop3/trunk/pop3.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/pop3/trunk/pop3.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -204,7 +204,7 @@
  *
  * Every user visible function must have an entry in pop3_functions[].
  */
-function_entry pop3_functions[] = {
+zend_function_entry pop3_functions[] = {
 	PHP_FE(pop3_open,	NULL)
 	PHP_FE(pop3_close, NULL)
 	PHP_FE(pop3_get_message_count, NULL)
@@ -225,7 +225,7 @@

 /* {{{ pop3_class_functions
  */
-function_entry pop3_class_functions[] = {
+zend_function_entry pop3_class_functions[] = {
 	POP3_ME_MAPPING(pop3, pop3_open, NULL)
 	POP3_ME_MAPPING(get_message_count, pop3_get_message_count, NULL)
 	POP3_ME_MAPPING(get_account_size, pop3_get_account_size, NULL)

Modified: pecl/printer/trunk/printer.c
===================================================================
--- pecl/printer/trunk/printer.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/printer/trunk/printer.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -48,7 +48,7 @@
 static void object_close(zend_rsrc_list_entry *resource TSRMLS_DC);
 char *get_default_printer(void);

-function_entry printer_functions[] = {
+zend_function_entry printer_functions[] = {
 	PHP_FE(printer_open,				NULL)
 	PHP_FE(printer_close,				NULL)
 	PHP_FE(printer_write,				NULL)

Modified: pecl/proctitle/trunk/proctitle.c
===================================================================
--- pecl/proctitle/trunk/proctitle.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/proctitle/trunk/proctitle.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -91,7 +91,7 @@
  *
  * Every user visible function must have an entry in proctitle_functions[].
  */
-static function_entry proctitle_functions[] = {
+static zend_function_entry proctitle_functions[] = {
 	PHP_FE(setproctitle,	NULL)		/* For testing, remove later. */
 	{NULL, NULL, NULL}	/* Must be the last line in proctitle_functions[] */
 };

Modified: pecl/ps/trunk/ps.c
===================================================================
--- pecl/ps/trunk/ps.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/ps/trunk/ps.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -55,7 +55,7 @@

 /* {{{ ps_functions[]
  */
-function_entry ps_functions[] = {
+zend_function_entry ps_functions[] = {
 	PHP_FE(ps_new, NULL)
 	PHP_FE(ps_delete, NULL)
 	PHP_FE(ps_open_file, NULL)

Modified: pecl/python/trunk/python.c
===================================================================
--- pecl/python/trunk/python.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/python/trunk/python.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -40,7 +40,7 @@

 /* {{{ python_functions[]
  */
-function_entry python_functions[] = {
+zend_function_entry python_functions[] = {
 	PHP_FE(python_version,		NULL)
 	PHP_FE(python_eval,			NULL)
 	PHP_FE(python_exec,			NULL)

Modified: pecl/qtdom/trunk/qtdom.c
===================================================================
--- pecl/qtdom/trunk/qtdom.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/qtdom/trunk/qtdom.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -46,7 +46,7 @@

 /* Every user visible function must have an entry in qtdom_functions[].
 */
-function_entry qtdom_functions[] = {
+zend_function_entry qtdom_functions[] = {
 	PHP_FE(qdom_tree,	NULL)
   	PHP_FE(qdom_error,	NULL)
 	{NULL, NULL, NULL}	/* Must be the last line in qtdom_functions[] */

Modified: pecl/radius/trunk/radius.c
===================================================================
--- pecl/radius/trunk/radius.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/radius/trunk/radius.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -62,7 +62,7 @@
  *
  * Every user visible function must have an entry in radius_functions[].
  */
-function_entry radius_functions[] = {
+zend_function_entry radius_functions[] = {
 	PHP_FE(radius_auth_open,    NULL)
 	PHP_FE(radius_acct_open,    NULL)
 	PHP_FE(radius_close,        NULL)

Modified: pecl/rar/trunk/rar.c
===================================================================
--- pecl/rar/trunk/rar.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/rar/trunk/rar.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -283,7 +283,7 @@
 /* {{{ rar_functions[]
  *
  */
-static function_entry rar_functions[] = {
+static zend_function_entry rar_functions[] = {
 	PHP_FE(rar_open,		arginfo_rar_open)
 	PHP_FE(rar_list,		arginfo_rar_void_archmeth)
 	PHP_FE(rar_entry_get,	arginfo_rar_entry_get)

Modified: pecl/rpmreader/trunk/rpmreader.c
===================================================================
--- pecl/rpmreader/trunk/rpmreader.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/rpmreader/trunk/rpmreader.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -42,7 +42,7 @@
 /* True global variables */
 static int le_rpmreader;

-static function_entry rpmreader_functions[] = {
+static zend_function_entry rpmreader_functions[] = {
 	PHP_FE(rpm_close, NULL)
 	PHP_FE(rpm_get_tag, NULL)
 	PHP_FE(rpm_is_valid, NULL)

Modified: pecl/runkit/trunk/runkit.c
===================================================================
--- pecl/runkit/trunk/runkit.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/runkit/trunk/runkit.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -73,7 +73,7 @@

 /* {{{ runkit_functions[]
  */
-function_entry runkit_functions[] = {
+zend_function_entry runkit_functions[] = {

 	PHP_FE(runkit_zval_inspect,										NULL)
 #ifdef ZEND_ENGINE_2

Modified: pecl/runkit/trunk/runkit_sandbox.c
===================================================================
--- pecl/runkit/trunk/runkit_sandbox.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/runkit/trunk/runkit_sandbox.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -1721,7 +1721,7 @@
 	ZEND_ARG_PASS_INFO(0)
 ZEND_END_ARG_INFO()

-static function_entry php_runkit_sandbox_functions[] = {
+static zend_function_entry php_runkit_sandbox_functions[] = {
 	PHP_ME(Runkit_Sandbox,		__construct,				NULL,								ZEND_ACC_PUBLIC		| ZEND_ACC_CTOR)
 	PHP_ME(Runkit_Sandbox,		__call,						arginfo_runkit_sandbox__call,		ZEND_ACC_PUBLIC)
 	/* Language Constructs */

Modified: pecl/runkit/trunk/runkit_sandbox_parent.c
===================================================================
--- pecl/runkit/trunk/runkit_sandbox_parent.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/runkit/trunk/runkit_sandbox_parent.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -706,7 +706,7 @@
 	ZEND_ARG_PASS_INFO(0)
 ZEND_END_ARG_INFO()

-static function_entry php_runkit_sandbox_parent_functions[] = {
+static zend_function_entry php_runkit_sandbox_parent_functions[] = {
 	PHP_ME(Runkit_Sandbox_Parent,		__call,						arginfo_runkit_sandbox_parent__call,ZEND_ACC_PUBLIC)
 	/* Language Constructs */
 	PHP_ME(Runkit_Sandbox_Parent,		eval,						NULL,								ZEND_ACC_PUBLIC)

Modified: pecl/sasl/trunk/sasl.c
===================================================================
--- pecl/sasl/trunk/sasl.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/sasl/trunk/sasl.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -570,7 +570,7 @@

 /* {{{ sasl_functions[]
  */
-function_entry sasl_functions[] = {
+zend_function_entry sasl_functions[] = {
 	/* Common Functions */
 	PHP_FE(sasl_version,			NULL)
 	PHP_FE(sasl_errstring,			NULL)

Modified: pecl/session_pgsql/trunk/session_pgsql.c
===================================================================
--- pecl/session_pgsql/trunk/session_pgsql.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/session_pgsql/trunk/session_pgsql.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -135,7 +135,7 @@

 /* {{{ session_pgsql_functions[]
  */
-function_entry session_pgsql_functions[] = {
+zend_function_entry session_pgsql_functions[] = {
 	PHP_FE(session_pgsql_status,	NULL)
 	PHP_FE(session_pgsql_reset,		NULL)
 	PHP_FE(session_pgsql_info,		NULL)

Modified: pecl/shp/trunk/shp.c
===================================================================
--- pecl/shp/trunk/shp.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/shp/trunk/shp.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -580,7 +580,7 @@
  *
  * Every user visible function must have an entry in shp_functions[].
  */
-function_entry shp_functions[] = {
+zend_function_entry shp_functions[] = {
 	PHP_FE(shp_get_info,		NULL)
 	PHP_FE(shp_close,			NULL)
 	PHP_FE(shp_compute_extents,	NULL)

Modified: pecl/simple_cvs/trunk/simple_cvs.c
===================================================================
--- pecl/simple_cvs/trunk/simple_cvs.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/simple_cvs/trunk/simple_cvs.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -41,7 +41,7 @@
  *
  * Every user visible function must have an entry in simple_cvs_functions[].
  */
-function_entry simple_cvs_functions[] = {
+zend_function_entry simple_cvs_functions[] = {
 	PHP_FE(scvs_checkout,	NULL)
 	PHP_FE(scvs_update,	NULL)
 	PHP_FE(scvs_login,	NULL)

Modified: pecl/smtp/trunk/smtp.c
===================================================================
--- pecl/smtp/trunk/smtp.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/smtp/trunk/smtp.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -78,7 +78,7 @@

 /* {{{ smtp_functions[]
  */
-function_entry smtp_functions[] = {
+zend_function_entry smtp_functions[] = {
 	PHP_FE(smtp_connect,	NULL)
 	PHP_FE(smtp_close,		NULL)
 	PHP_FE(smtp_cmd_mail,	NULL)

Modified: pecl/sndfile/trunk/sndfile.c
===================================================================
--- pecl/sndfile/trunk/sndfile.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/sndfile/trunk/sndfile.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -101,7 +101,7 @@

 /* {{{ php_sndfile_functions[]
  */
-function_entry php_sndfile_functions[] =
+zend_function_entry php_sndfile_functions[] =
 {
 	PHP_FE(sndfile_open,                  third_arg_force_ref)
 	PHP_FE(sndfile_close,                 NULL)

Modified: pecl/spplus/trunk/php_spplus.c
===================================================================
--- pecl/spplus/trunk/php_spplus.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/spplus/trunk/php_spplus.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -35,7 +35,7 @@
 PHP_FUNCTION(calculhmac);

 /* {{{ spplus_functions[] */
-function_entry spplus_functions[] = {
+zend_function_entry spplus_functions[] = {
 	PHP_FE(calcul_hmac,	NULL)
 	PHP_FE(nthmac,	NULL)
 	PHP_FE(signeurlpaiement,	NULL)

Modified: pecl/spread/trunk/php_spread.c
===================================================================
--- pecl/spread/trunk/php_spread.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/spread/trunk/php_spread.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -104,7 +104,7 @@

 /* {{{ spread_functions[] */

-function_entry spread_functions[] = {
+zend_function_entry spread_functions[] = {
 	PHP_FE(spread_connect, arginfo_spread_connect)
 	PHP_FE(spread_multicast, arginfo_spread_multicast)
 	PHP_FE(spread_disconnect, arginfo_spread_disconnect)

Modified: pecl/ssh2/trunk/ssh2.c
===================================================================
--- pecl/ssh2/trunk/ssh2.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/ssh2/trunk/ssh2.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -1269,7 +1269,7 @@

 /* {{{ ssh2_functions[]
  */
-function_entry ssh2_functions[] = {
+zend_function_entry ssh2_functions[] = {
 	PHP_FE(ssh2_connect,						NULL)
 	PHP_FE(ssh2_methods_negotiated,				NULL)
 	PHP_FE(ssh2_fingerprint,					NULL)

Modified: pecl/statgrab/trunk/statgrab.c
===================================================================
--- pecl/statgrab/trunk/statgrab.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/statgrab/trunk/statgrab.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -67,7 +67,7 @@
  *
  * Every user visible function must have an entry in statgrab_functions[].
  */
-function_entry statgrab_functions[] = {
+zend_function_entry statgrab_functions[] = {
 	PHP_FE(sg_cpu_percent_usage,	NULL)
 	PHP_FE(sg_cpu_totals,		NULL)
 	PHP_FE(sg_cpu_diff,		NULL)

Modified: pecl/stem/trunk/stem.c
===================================================================
--- pecl/stem/trunk/stem.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/stem/trunk/stem.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -36,7 +36,7 @@

 /* {{{ stem_functions[]
 */
-function_entry stem_functions[] = {
+zend_function_entry stem_functions[] = {
 	PHP_FE(stem,				NULL)
 	PHP_FE(stem_enabled,		NULL)


Modified: pecl/swf/trunk/swf.c
===================================================================
--- pecl/swf/trunk/swf.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/swf/trunk/swf.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -36,7 +36,7 @@

 /* {{{ swf_functions[]
  */
-function_entry swf_functions[] = {
+zend_function_entry swf_functions[] = {
 	PHP_FE(swf_openfile,		NULL)
 	PHP_FE(swf_closefile,		NULL)
 	PHP_FE(swf_labelframe,		NULL)

Modified: pecl/tclink/trunk/php_tclink.c
===================================================================
--- pecl/tclink/trunk/php_tclink.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/tclink/trunk/php_tclink.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -36,7 +36,7 @@

 #if HAVE_TCLINK

-function_entry php_tclink_functions[] = {
+zend_function_entry php_tclink_functions[] = {
 	PHP_FE(tclink_send, NULL)
 	PHP_FE(tclink_getversion, NULL)
 	{NULL, NULL, NULL}

Modified: pecl/tcpwrap/trunk/tcpwrap.c
===================================================================
--- pecl/tcpwrap/trunk/tcpwrap.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/tcpwrap/trunk/tcpwrap.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -39,7 +39,7 @@
  *
  * Every user visible function must have an entry in tcpwrap_functions[].
  */
-function_entry tcpwrap_functions[] = {
+zend_function_entry tcpwrap_functions[] = {
 	PHP_FE(tcpwrap_check,	NULL)		/* For testing, remove later. */
 	{NULL, NULL, NULL}	/* Must be the last line in tcpwrap_functions[] */
 };

Modified: pecl/threads/trunk/threads.c
===================================================================
--- pecl/threads/trunk/threads.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/threads/trunk/threads.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -57,7 +57,7 @@
  *
  * Every user visible function must have an entry in threads_functions[].
  */
-function_entry threads_functions[] = {
+zend_function_entry threads_functions[] = {
 	PHP_FE(thread_start,	NULL)
 	PHP_FE(thread_include,	NULL)
 	PHP_FE(thread_set,	NULL)

Modified: pecl/timezonedb/trunk/timezonedb.c
===================================================================
--- pecl/timezonedb/trunk/timezonedb.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/timezonedb/trunk/timezonedb.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -37,7 +37,7 @@

 /* {{{ timezonedb_functions[]
  */
-function_entry timezonedb_functions[] = {
+zend_function_entry timezonedb_functions[] = {
 	{NULL, NULL, NULL}
 };
 /* }}} */

Modified: pecl/translit/trunk/translit.c
===================================================================
--- pecl/translit/trunk/translit.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/translit/trunk/translit.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -29,7 +29,7 @@
 #include "php_translit.h"

 /* {{{ translit_functions[] */
-function_entry translit_functions[] = {
+zend_function_entry translit_functions[] = {
 	PHP_FE(transliterate, NULL)
 	PHP_FE(transliterate_filters_get, NULL)
 	{NULL, NULL, NULL}

Modified: pecl/uploadprogress/trunk/uploadprogress.c
===================================================================
--- pecl/uploadprogress/trunk/uploadprogress.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/uploadprogress/trunk/uploadprogress.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -32,7 +32,7 @@
 #endif

 /* {{{ uploadprogress_functions[] */
-function_entry uploadprogress_functions[] = {
+zend_function_entry uploadprogress_functions[] = {
     PHP_FE(uploadprogress_get_info, NULL)
     PHP_FE(uploadprogress_get_contents, NULL)
     { NULL, NULL, NULL }

Modified: pecl/usblib/trunk/php_usblib.c
===================================================================
--- pecl/usblib/trunk/php_usblib.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/usblib/trunk/php_usblib.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -380,7 +380,7 @@
  *
  * Every user visible function must have an entry in usblib_functions[].
  */
-function_entry usblib_functions[] = {
+zend_function_entry usblib_functions[] = {
 	PHP_FE(usblib_init,			NULL)
 	PHP_FE(usblib_set_debug,	NULL)
 	PHP_FE(usblib_find_busses,	NULL)

Modified: pecl/uuid/trunk/uuid.c
===================================================================
--- pecl/uuid/trunk/uuid.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/uuid/trunk/uuid.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -29,7 +29,7 @@
 #if HAVE_UUID

 /* {{{ uuid_functions[] */
-function_entry uuid_functions[] = {
+zend_function_entry uuid_functions[] = {
 	PHP_FE(uuid_create         , uuid_create_arg_info)
 	PHP_FE(uuid_is_valid       , uuid_is_valid_arg_info)
 	PHP_FE(uuid_compare        , uuid_compare_arg_info)

Modified: pecl/valkyrie/trunk/valkyrie.c
===================================================================
--- pecl/valkyrie/trunk/valkyrie.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/valkyrie/trunk/valkyrie.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -45,7 +45,7 @@
  *
  * Every user visible function must have an entry in valkyrie_functions[].
  */
-function_entry valkyrie_functions[] = {
+zend_function_entry valkyrie_functions[] = {
 	PHP_FE(valkyrie_validate,  NULL)
 	PHP_FE(valkyrie_reload_config,  NULL)
 	{NULL, NULL, NULL}	/* Must be the last line in valkyrie_functions[] */

Modified: pecl/vpopmail/trunk/php_vpopmail.c
===================================================================
--- pecl/vpopmail/trunk/php_vpopmail.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/vpopmail/trunk/php_vpopmail.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -60,7 +60,7 @@

 /* Function table */

-function_entry vpopmail_functions[] = {
+zend_function_entry vpopmail_functions[] = {
 	/* domain management - lib call */
 	PHP_FE(vpopmail_add_domain, NULL)
 	PHP_FE(vpopmail_del_domain, NULL)

Modified: pecl/w32api/trunk/w32api.c
===================================================================
--- pecl/w32api/trunk/w32api.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/w32api/trunk/w32api.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -1431,7 +1431,7 @@

 /* {{{ win32_class_functions[]
  */
-function_entry win32_class_functions[] = {
+zend_function_entry win32_class_functions[] = {
 	W32API_CLASS_FE(win32, registerfunction, NULL)
 	W32API_CLASS_FE(win32, unregisterfunction, NULL)
 	W32API_CLASS_FE(win32, registercallback, NULL)
@@ -1878,7 +1878,7 @@

 /* {{{ type_class_functions[]
  */
-function_entry type_class_functions[] = {
+zend_function_entry type_class_functions[] = {
 	W32API_CLASS_FE(type, clone, NULL)
 	{NULL, NULL, NULL}
 };

Modified: pecl/win32scheduler/trunk/win32scheduler.c
===================================================================
--- pecl/win32scheduler/trunk/win32scheduler.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/win32scheduler/trunk/win32scheduler.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -588,7 +588,7 @@



-static function_entry functions[] = {
+static zend_function_entry functions[] = {
 	PHP_FE(win32_scheduler_enum_tasks, NULL)
 	PHP_FE(win32_scheduler_run, NULL)
 	PHP_FE(win32_scheduler_get_task_info, NULL)

Modified: pecl/win32service/trunk/win32service.c
===================================================================
--- pecl/win32service/trunk/win32service.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/win32service/trunk/win32service.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -418,7 +418,7 @@
 /* }}} */


-static function_entry functions[] = {
+static zend_function_entry functions[] = {
 	PHP_FE(win32_start_service_ctrl_dispatcher, NULL)
 	PHP_FE(win32_set_service_status, NULL)
 	PHP_FE(win32_create_service, NULL)

Modified: pecl/win32std/trunk/win32std.c
===================================================================
--- pecl/win32std/trunk/win32std.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/win32std/trunk/win32std.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -352,7 +352,7 @@
  *
  * Every user visible function must have an entry in win32std_functions[].
  */
-function_entry win32std_functions[] = {
+zend_function_entry win32std_functions[] = {

 	/* Res */
 	PHP_FE(res_get,			NULL)

Modified: pecl/wincache/trunk/php_wincache.c
===================================================================
--- pecl/wincache/trunk/php_wincache.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/wincache/trunk/php_wincache.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -195,7 +195,7 @@
 #endif

 /* Put all user defined functions here */
-function_entry wincache_functions[] = {
+zend_function_entry wincache_functions[] = {
     PHP_FE(wincache_rplist_fileinfo, arginfo_wincache_rplist_fileinfo)
     PHP_FE(wincache_rplist_meminfo, arginfo_wincache_rplist_meminfo)
     PHP_FE(wincache_fcache_fileinfo, arginfo_wincache_fcache_fileinfo)

Modified: pecl/wxwidgets/trunk/app.h
===================================================================
--- pecl/wxwidgets/trunk/app.h	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/wxwidgets/trunk/app.h	2010-03-31 20:39:48 UTC (rev 297236)
@@ -15,7 +15,7 @@
 		void ***tsrm_ls;
 };

-static function_entry php_wxApp_functions[] = {
+static zend_function_entry php_wxApp_functions[] = {
 	PHP_ME(php_wxApp, helloWorld ,NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxApp, SetInstance ,NULL,ZEND_ACC_STATIC|ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxApp, Yield ,NULL,ZEND_ACC_PUBLIC)

Modified: pecl/wxwidgets/trunk/frame.h
===================================================================
--- pecl/wxwidgets/trunk/frame.h	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/wxwidgets/trunk/frame.h	2010-03-31 20:39:48 UTC (rev 297236)
@@ -21,7 +21,7 @@

 extern int le_wxFrame;

-static function_entry php_wxFrame_functions[] = {
+static zend_function_entry php_wxFrame_functions[] = {
 	PHP_ME(php_wxWindow, Show, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxWindow, Create, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxWindow, Destroy, NULL,ZEND_ACC_PUBLIC)
@@ -87,7 +87,7 @@

 extern int le_wxEvent;

-static function_entry php_wxEvent_functions[] = {
+static zend_function_entry php_wxEvent_functions[] = {
 	PHP_ME(php_wxEvent, GetId, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxEvent, SetEventType, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxEvent, GetEventType, NULL,ZEND_ACC_PUBLIC)
@@ -127,7 +127,7 @@

 extern int le_wxWindow;

-static function_entry php_wxWindow_functions[] = {
+static zend_function_entry php_wxWindow_functions[] = {
 	PHP_ME(php_wxWindowBase, SetSizer, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxWindowBase, GetSizer, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxWindowBase, Layout, NULL,ZEND_ACC_PUBLIC)
@@ -189,7 +189,7 @@

 extern int le_wxPoint;

-static function_entry php_wxPoint_functions[] = {
+static zend_function_entry php_wxPoint_functions[] = {
 	PHP_ME(php_wxPoint, __construct, NULL,ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	{ NULL, NULL, NULL }
 };
@@ -213,7 +213,7 @@

 extern int le_wxSize;

-static function_entry php_wxSize_functions[] = {
+static zend_function_entry php_wxSize_functions[] = {
 	PHP_ME(php_wxSize, __construct, NULL,ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	{ NULL, NULL, NULL }
 };
@@ -240,7 +240,7 @@

 extern int le_wxToolBar;

-static function_entry php_wxToolBar_functions[] = {
+static zend_function_entry php_wxToolBar_functions[] = {
 	PHP_ME(php_wxToolBarBase, AddCheckTool, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxToolBarBase, AddRadioTool, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxToolBarBase, InsertTool, NULL,ZEND_ACC_PUBLIC)
@@ -304,7 +304,7 @@

 extern int le_wxStatusBar;

-static function_entry php_wxStatusBar_functions[] = {
+static zend_function_entry php_wxStatusBar_functions[] = {
 	PHP_ME(php_wxStatusBarBase, PushStatusText, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxStatusBarBase, PopStatusText, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxWindow, Show, NULL,ZEND_ACC_PUBLIC)
@@ -360,7 +360,7 @@

 extern int le_wxBoxSizer;

-static function_entry php_wxBoxSizer_functions[] = {
+static zend_function_entry php_wxBoxSizer_functions[] = {
 	PHP_ME(php_wxSizer, Add, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxSizer, AddSpacer, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxSizer, AddStretchSpacer, NULL,ZEND_ACC_PUBLIC)
@@ -412,7 +412,7 @@

 extern int le_wxSizer;

-static function_entry php_wxSizer_functions[] = {
+static zend_function_entry php_wxSizer_functions[] = {
 	PHP_ME(php_wxSizer, Add, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxSizer, AddSpacer, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxSizer, AddStretchSpacer, NULL,ZEND_ACC_PUBLIC)
@@ -471,7 +471,7 @@

 extern int le_wxColour;

-static function_entry php_wxColour_functions[] = {
+static zend_function_entry php_wxColour_functions[] = {
 	PHP_ME(php_wxColour, __construct, NULL,ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	{ NULL, NULL, NULL }
 };
@@ -504,7 +504,7 @@

 extern int le_wxCursor;

-static function_entry php_wxCursor_functions[] = {
+static zend_function_entry php_wxCursor_functions[] = {
 	PHP_ME(php_wxCursor, __construct, NULL,ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	{ NULL, NULL, NULL }
 };
@@ -528,7 +528,7 @@

 extern int le_wxFont;

-static function_entry php_wxFont_functions[] = {
+static zend_function_entry php_wxFont_functions[] = {
 	PHP_ME(php_wxFont, __construct, NULL,ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	{ NULL, NULL, NULL }
 };
@@ -549,7 +549,7 @@

 extern int le_wxWindowBase;

-static function_entry php_wxWindowBase_functions[] = {
+static zend_function_entry php_wxWindowBase_functions[] = {
 	PHP_ME(php_wxWindowBase, SetSizer, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxWindowBase, GetSizer, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxWindowBase, Layout, NULL,ZEND_ACC_PUBLIC)
@@ -582,7 +582,7 @@

 extern int le_wxSizerFlags;

-static function_entry php_wxSizerFlags_functions[] = {
+static zend_function_entry php_wxSizerFlags_functions[] = {
 	PHP_ME(php_wxSizerFlags, __construct, NULL,ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	{ NULL, NULL, NULL }
 };
@@ -606,7 +606,7 @@

 extern int le_wxSizerItem;

-static function_entry php_wxSizerItem_functions[] = {
+static zend_function_entry php_wxSizerItem_functions[] = {
 	PHP_ME(php_wxSizerItem, __construct, NULL,ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	{ NULL, NULL, NULL }
 };
@@ -627,7 +627,7 @@

 extern int le_wxClassInfo;

-static function_entry php_wxClassInfo_functions[] = {
+static zend_function_entry php_wxClassInfo_functions[] = {
 	PHP_ME(php_wxClassInfo, GetSize, NULL,ZEND_ACC_PUBLIC)
 	{ NULL, NULL, NULL }
 };
@@ -648,7 +648,7 @@

 extern int le_wxObject;

-static function_entry php_wxObject_functions[] = {
+static zend_function_entry php_wxObject_functions[] = {
 	PHP_ME(php_wxObject, IsKindOf, NULL,ZEND_ACC_PUBLIC)
 	{ NULL, NULL, NULL }
 };
@@ -681,7 +681,7 @@

 extern int le_wxImage;

-static function_entry php_wxImage_functions[] = {
+static zend_function_entry php_wxImage_functions[] = {
 	PHP_ME(php_wxImage, __construct, NULL,ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	{ NULL, NULL, NULL }
 };
@@ -702,7 +702,7 @@

 extern int le_wxMenuItem;

-static function_entry php_wxMenuItem_functions[] = {
+static zend_function_entry php_wxMenuItem_functions[] = {
 	PHP_ME(php_wxMenuItemBase, SetMenu, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxMenuItemBase, GetMenu, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxMenuItemBase, GetId, NULL,ZEND_ACC_PUBLIC)
@@ -740,7 +740,7 @@

 extern int le_wxMenuItemBase;

-static function_entry php_wxMenuItemBase_functions[] = {
+static zend_function_entry php_wxMenuItemBase_functions[] = {
 	PHP_ME(php_wxMenuItemBase, SetMenu, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxMenuItemBase, GetMenu, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxMenuItemBase, GetId, NULL,ZEND_ACC_PUBLIC)
@@ -783,7 +783,7 @@

 extern int le_wxMenu;

-static function_entry php_wxMenu_functions[] = {
+static zend_function_entry php_wxMenu_functions[] = {
 	PHP_ME(php_wxMenuBase, Append, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxMenuBase, AppendCheckItem, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxMenuBase, AppendRadioItem, NULL,ZEND_ACC_PUBLIC)
@@ -843,7 +843,7 @@

 extern int le_wxBitmap;

-static function_entry php_wxBitmap_functions[] = {
+static zend_function_entry php_wxBitmap_functions[] = {
 	PHP_ME(php_wxBitmap, __construct, NULL,ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	{ NULL, NULL, NULL }
 };
@@ -864,7 +864,7 @@

 extern int le_wxMenuBase;

-static function_entry php_wxMenuBase_functions[] = {
+static zend_function_entry php_wxMenuBase_functions[] = {
 	PHP_ME(php_wxMenuBase, Append, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxMenuBase, AppendCheckItem, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxMenuBase, AppendRadioItem, NULL,ZEND_ACC_PUBLIC)
@@ -919,7 +919,7 @@

 extern int le_wxMenuBar;

-static function_entry php_wxMenuBar_functions[] = {
+static zend_function_entry php_wxMenuBar_functions[] = {
 	PHP_ME(php_wxMenuBar, __construct, NULL,ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(php_wxMenuBar, Append, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxMenuBar, Insert, NULL,ZEND_ACC_PUBLIC)
@@ -947,7 +947,7 @@

 extern int le_wxToolBarBase;

-static function_entry php_wxToolBarBase_functions[] = {
+static zend_function_entry php_wxToolBarBase_functions[] = {
 	PHP_ME(php_wxControl, SetLabel, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxControl, GetLabel, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxToolBarBase, AddCheckTool, NULL,ZEND_ACC_PUBLIC)
@@ -1003,7 +1003,7 @@

 extern int le_wxToolBarToolBase;

-static function_entry php_wxToolBarToolBase_functions[] = {
+static zend_function_entry php_wxToolBarToolBase_functions[] = {
 	PHP_ME(php_wxToolBarToolBase, GetId, NULL,ZEND_ACC_PUBLIC)
 	{ NULL, NULL, NULL }
 };
@@ -1024,7 +1024,7 @@

 extern int le_wxControl;

-static function_entry php_wxControl_functions[] = {
+static zend_function_entry php_wxControl_functions[] = {
 	PHP_ME(php_wxControl, SetLabel, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxControl, GetLabel, NULL,ZEND_ACC_PUBLIC)
 	{ NULL, NULL, NULL }
@@ -1049,7 +1049,7 @@

 extern int le_wxCommandEvent;

-static function_entry php_wxCommandEvent_functions[] = {
+static zend_function_entry php_wxCommandEvent_functions[] = {
 	PHP_ME(php_wxEvent, GetId, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxEvent, SetEventType, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxEvent, GetEventType, NULL,ZEND_ACC_PUBLIC)
@@ -1099,7 +1099,7 @@

 extern int le_wxPanel;

-static function_entry php_wxPanel_functions[] = {
+static zend_function_entry php_wxPanel_functions[] = {
 	PHP_ME(php_wxWindow, Show, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxWindow, Create, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxWindow, Destroy, NULL,ZEND_ACC_PUBLIC)
@@ -1160,7 +1160,7 @@

 extern int le_wxTopLevelWindowBase;

-static function_entry php_wxTopLevelWindowBase_functions[] = {
+static zend_function_entry php_wxTopLevelWindowBase_functions[] = {
 	PHP_ME(php_wxTopLevelWindowBase, SetIcon, NULL,ZEND_ACC_PUBLIC)
 	{ NULL, NULL, NULL }
 };
@@ -1184,7 +1184,7 @@

 extern int le_wxSplitterWindow;

-static function_entry php_wxSplitterWindow_functions[] = {
+static zend_function_entry php_wxSplitterWindow_functions[] = {
 	PHP_ME(php_wxWindow, Show, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxWindow, Create, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxWindow, Destroy, NULL,ZEND_ACC_PUBLIC)
@@ -1249,7 +1249,7 @@

 extern int le_wxTreeCtrl;

-static function_entry php_wxTreeCtrl_functions[] = {
+static zend_function_entry php_wxTreeCtrl_functions[] = {
 	PHP_ME(php_wxWindow, Show, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxWindow, Create, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxWindow, Destroy, NULL,ZEND_ACC_PUBLIC)
@@ -1304,7 +1304,7 @@

 extern int le_wxValidator;

-static function_entry php_wxValidator_functions[] = {
+static zend_function_entry php_wxValidator_functions[] = {
 	PHP_ME(php_wxValidator, __construct, NULL,ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(php_wxValidator, Connect, NULL,ZEND_ACC_PUBLIC)
 	{ NULL, NULL, NULL }
@@ -1332,7 +1332,7 @@

 extern int le_wxCheckListBox;

-static function_entry php_wxCheckListBox_functions[] = {
+static zend_function_entry php_wxCheckListBox_functions[] = {
 	PHP_ME(php_wxWindow, Show, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxWindow, Create, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxWindow, Destroy, NULL,ZEND_ACC_PUBLIC)
@@ -1402,7 +1402,7 @@

 extern int le_wxTreeItemData;

-static function_entry php_wxTreeItemData_functions[] = {
+static zend_function_entry php_wxTreeItemData_functions[] = {
 	PHP_ME(php_wxTreeItemData, __construct, NULL,ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	{ NULL, NULL, NULL }
 };
@@ -1426,7 +1426,7 @@

 extern int le_wxTreeItemId;

-static function_entry php_wxTreeItemId_functions[] = {
+static zend_function_entry php_wxTreeItemId_functions[] = {
 	PHP_ME(php_wxTreeItemId, __construct, NULL,ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	{ NULL, NULL, NULL }
 };
@@ -1447,7 +1447,7 @@

 extern int le_wxFrameBase;

-static function_entry php_wxFrameBase_functions[] = {
+static zend_function_entry php_wxFrameBase_functions[] = {
 	PHP_ME(php_wxFrameBase, SetMenuBar, NULL,ZEND_ACC_PUBLIC)
 	{ NULL, NULL, NULL }
 };
@@ -1468,7 +1468,7 @@

 extern int le_wxTreeEvent;

-static function_entry php_wxTreeEvent_functions[] = {
+static zend_function_entry php_wxTreeEvent_functions[] = {
 	PHP_ME(php_wxEvent, GetId, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxEvent, SetEventType, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxEvent, GetEventType, NULL,ZEND_ACC_PUBLIC)
@@ -1515,7 +1515,7 @@

 extern int le_wxArrayString;

-static function_entry php_wxArrayString_functions[] = {
+static zend_function_entry php_wxArrayString_functions[] = {
 	PHP_ME(php_wxArrayString, __construct, NULL,ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(php_wxArrayString, Add, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxArrayString, Empty, NULL,ZEND_ACC_PUBLIC)
@@ -1539,7 +1539,7 @@

 extern int le_wxCheckListBoxBase;

-static function_entry php_wxCheckListBoxBase_functions[] = {
+static zend_function_entry php_wxCheckListBoxBase_functions[] = {
 	PHP_ME(php_wxCheckListBoxBase, Check, NULL,ZEND_ACC_PUBLIC)
 	{ NULL, NULL, NULL }
 };
@@ -1560,7 +1560,7 @@

 extern int le_wxListBoxBase;

-static function_entry php_wxListBoxBase_functions[] = {
+static zend_function_entry php_wxListBoxBase_functions[] = {
 	PHP_ME(php_wxListBoxBase, Set, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxListBoxBase, Deselect, NULL,ZEND_ACC_PUBLIC)
 	{ NULL, NULL, NULL }
@@ -1585,7 +1585,7 @@

 extern int le_wxIcon;

-static function_entry php_wxIcon_functions[] = {
+static zend_function_entry php_wxIcon_functions[] = {
 	PHP_ME(php_wxIcon, __construct, NULL,ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(php_wxIcon, CopyFromBitmap, NULL,ZEND_ACC_PUBLIC)
 	{ NULL, NULL, NULL }
@@ -1610,7 +1610,7 @@

 extern int le_wxTextCtrl;

-static function_entry php_wxTextCtrl_functions[] = {
+static zend_function_entry php_wxTextCtrl_functions[] = {
 	PHP_ME(php_wxWindow, Show, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxWindow, Create, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxWindow, Destroy, NULL,ZEND_ACC_PUBLIC)
@@ -1665,7 +1665,7 @@

 extern int le_wxNotebook;

-static function_entry php_wxNotebook_functions[] = {
+static zend_function_entry php_wxNotebook_functions[] = {
 	PHP_ME(php_wxWindow, Show, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxWindow, Create, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxWindow, Destroy, NULL,ZEND_ACC_PUBLIC)
@@ -1731,7 +1731,7 @@

 extern int le_wxBookCtrlBase;

-static function_entry php_wxBookCtrlBase_functions[] = {
+static zend_function_entry php_wxBookCtrlBase_functions[] = {
 	PHP_ME(php_wxBookCtrlBase, AddPage, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxBookCtrlBase, SetSelection, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxBookCtrlBase, RemovePage, NULL,ZEND_ACC_PUBLIC)
@@ -1767,7 +1767,7 @@

 extern int le_wxFlexGridSizer;

-static function_entry php_wxFlexGridSizer_functions[] = {
+static zend_function_entry php_wxFlexGridSizer_functions[] = {
 	PHP_ME(php_wxSizer, Add, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxSizer, AddSpacer, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxSizer, AddStretchSpacer, NULL,ZEND_ACC_PUBLIC)
@@ -1827,7 +1827,7 @@

 extern int le_wxStaticText;

-static function_entry php_wxStaticText_functions[] = {
+static zend_function_entry php_wxStaticText_functions[] = {
 	PHP_ME(php_wxWindow, Show, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxWindow, Create, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxWindow, Destroy, NULL,ZEND_ACC_PUBLIC)
@@ -1881,7 +1881,7 @@

 extern int le_wxButton;

-static function_entry php_wxButton_functions[] = {
+static zend_function_entry php_wxButton_functions[] = {
 	PHP_ME(php_wxWindow, Show, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxWindow, Create, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxWindow, Destroy, NULL,ZEND_ACC_PUBLIC)
@@ -1935,7 +1935,7 @@

 extern int le_wxStaticBox;

-static function_entry php_wxStaticBox_functions[] = {
+static zend_function_entry php_wxStaticBox_functions[] = {
 	PHP_ME(php_wxWindow, Show, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxWindow, Create, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxWindow, Destroy, NULL,ZEND_ACC_PUBLIC)
@@ -2001,7 +2001,7 @@

 extern int le_wxStaticBoxSizer;

-static function_entry php_wxStaticBoxSizer_functions[] = {
+static zend_function_entry php_wxStaticBoxSizer_functions[] = {
 	PHP_ME(php_wxBoxSizer, RecalcSizes, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxBoxSizer, CalcMin, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxBoxSizer, GetOrientation, NULL,ZEND_ACC_PUBLIC)
@@ -2059,7 +2059,7 @@

 extern int le_wxListBox;

-static function_entry php_wxListBox_functions[] = {
+static zend_function_entry php_wxListBox_functions[] = {
 	PHP_ME(php_wxListBoxBase, Set, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxListBoxBase, Deselect, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxWindow, Show, NULL,ZEND_ACC_PUBLIC)
@@ -2127,7 +2127,7 @@

 extern int le_wxFileDialog;

-static function_entry php_wxFileDialog_functions[] = {
+static zend_function_entry php_wxFileDialog_functions[] = {
 	PHP_ME(php_wxDialog, EndModal, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxDialog, IsModal, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxWindow, Create, NULL,ZEND_ACC_PUBLIC)
@@ -2192,7 +2192,7 @@

 extern int le_wxDialog;

-static function_entry php_wxDialog_functions[] = {
+static zend_function_entry php_wxDialog_functions[] = {
 	PHP_ME(php_wxTopLevelWindowBase, SetIcon, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxWindow, Create, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxWindow, Destroy, NULL,ZEND_ACC_PUBLIC)
@@ -2258,7 +2258,7 @@

 extern int le_wxMessageDialog;

-static function_entry php_wxMessageDialog_functions[] = {
+static zend_function_entry php_wxMessageDialog_functions[] = {
 	PHP_ME(php_wxDialog, EndModal, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxDialog, IsModal, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxTopLevelWindowBase, SetIcon, NULL,ZEND_ACC_PUBLIC)
@@ -2321,7 +2321,7 @@

 extern int le_wxStatusBarBase;

-static function_entry php_wxStatusBarBase_functions[] = {
+static zend_function_entry php_wxStatusBarBase_functions[] = {
 	PHP_ME(php_wxStatusBarBase, PushStatusText, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxStatusBarBase, SetStatusText, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxStatusBarBase, GetStatusText, NULL,ZEND_ACC_PUBLIC)
@@ -2349,7 +2349,7 @@

 extern int le_wxListCtrl;

-static function_entry php_wxListCtrl_functions[] = {
+static zend_function_entry php_wxListCtrl_functions[] = {
 	PHP_ME(php_wxControl, SetLabel, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxControl, GetLabel, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxWindow, Show, NULL,ZEND_ACC_PUBLIC)
@@ -2434,7 +2434,7 @@

 extern int le_wxStaticBitmap;

-static function_entry php_wxStaticBitmap_functions[] = {
+static zend_function_entry php_wxStaticBitmap_functions[] = {
 	PHP_ME(php_wxWindow, Show, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxWindow, Create, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxWindow, Destroy, NULL,ZEND_ACC_PUBLIC)
@@ -2487,7 +2487,7 @@

 extern int le_wxGauge;

-static function_entry php_wxGauge_functions[] = {
+static zend_function_entry php_wxGauge_functions[] = {
 	PHP_ME(php_wxWindow, Show, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxWindow, Create, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxWindow, Destroy, NULL,ZEND_ACC_PUBLIC)
@@ -2545,7 +2545,7 @@

 extern int le_wxListEvent;

-static function_entry php_wxListEvent_functions[] = {
+static zend_function_entry php_wxListEvent_functions[] = {
 	PHP_ME(php_wxEvent, GetId, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxEvent, SetEventType, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxEvent, GetEventType, NULL,ZEND_ACC_PUBLIC)
@@ -2596,7 +2596,7 @@

 extern int le_wxComboBox;

-static function_entry php_wxComboBox_functions[] = {
+static zend_function_entry php_wxComboBox_functions[] = {
 	PHP_ME(php_wxWindow, Show, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxWindow, Create, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxWindow, Destroy, NULL,ZEND_ACC_PUBLIC)
@@ -2656,7 +2656,7 @@

 extern int le_wxPrinter;

-static function_entry php_wxPrinter_functions[] = {
+static zend_function_entry php_wxPrinter_functions[] = {
 	PHP_ME(php_wxPrinter, __construct, NULL,ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(php_wxPrinter, Print, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxPrinter, PrintDialog, NULL,ZEND_ACC_PUBLIC)
@@ -2683,7 +2683,7 @@

 extern int le_wxPrintout;

-static function_entry php_wxPrintout_functions[] = {
+static zend_function_entry php_wxPrintout_functions[] = {
 	PHP_ME(php_wxPrintout, __construct, NULL,ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(php_wxPrintout, GetDC, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxPrintout, SetDC, NULL,ZEND_ACC_PUBLIC)
@@ -2708,7 +2708,7 @@

 extern int le_wxDC;

-static function_entry php_wxDC_functions[] = {
+static zend_function_entry php_wxDC_functions[] = {
 	PHP_ME(php_wxDCBase, DrawText, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxDCBase, DrawCircle, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxDCBase, DrawEllipse, NULL,ZEND_ACC_PUBLIC)
@@ -2755,7 +2755,7 @@

 extern int le_wxDCBase;

-static function_entry php_wxDCBase_functions[] = {
+static zend_function_entry php_wxDCBase_functions[] = {
 	PHP_ME(php_wxDCBase, DrawText, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxDCBase, DrawCircle, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxDCBase, DrawEllipse, NULL,ZEND_ACC_PUBLIC)
@@ -2799,7 +2799,7 @@

 extern int le_wxPrintDialogData;

-static function_entry php_wxPrintDialogData_functions[] = {
+static zend_function_entry php_wxPrintDialogData_functions[] = {
 	PHP_ME(php_wxPrintDialogData, __construct, NULL,ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	{ NULL, NULL, NULL }
 };
@@ -2823,7 +2823,7 @@

 extern int le_wxRect;

-static function_entry php_wxRect_functions[] = {
+static zend_function_entry php_wxRect_functions[] = {
 	PHP_ME(php_wxRect, __construct, NULL,ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	{ NULL, NULL, NULL }
 };
@@ -2847,7 +2847,7 @@

 extern int le_wxPen;

-static function_entry php_wxPen_functions[] = {
+static zend_function_entry php_wxPen_functions[] = {
 	PHP_ME(php_wxPen, __construct, NULL,ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(php_wxPen, SetWidth, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxPen, SetStyle, NULL,ZEND_ACC_PUBLIC)
@@ -2880,7 +2880,7 @@

 extern int le_wxBrush;

-static function_entry php_wxBrush_functions[] = {
+static zend_function_entry php_wxBrush_functions[] = {
 	PHP_ME(php_wxBrush, __construct, NULL,ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(php_wxBrush, SetColour, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxBrush, SetStyle, NULL,ZEND_ACC_PUBLIC)
@@ -2907,7 +2907,7 @@

 extern int le_wxSplashScreen;

-static function_entry php_wxSplashScreen_functions[] = {
+static zend_function_entry php_wxSplashScreen_functions[] = {
 	PHP_ME(php_wxFrame, CreateStatusBar, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxFrame, CreateToolBar, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxFrame, GetClientAreaOrigin, NULL,ZEND_ACC_PUBLIC)
@@ -2977,7 +2977,7 @@

 extern int le_wxCalendarCtrl;

-static function_entry php_wxCalendarCtrl_functions[] = {
+static zend_function_entry php_wxCalendarCtrl_functions[] = {
 	PHP_ME(php_wxWindow, Create, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxWindow, Destroy, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxWindow, Raise, NULL,ZEND_ACC_PUBLIC)
@@ -3043,7 +3043,7 @@

 extern int le_wxCalendarEvent;

-static function_entry php_wxCalendarEvent_functions[] = {
+static zend_function_entry php_wxCalendarEvent_functions[] = {
 	PHP_ME(php_wxDateEvent, GetDate, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxDateEvent, SetDate, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxCommandEvent, GetSelection, NULL,ZEND_ACC_PUBLIC)
@@ -3075,7 +3075,7 @@

 extern int le_wxDateEvent;

-static function_entry php_wxDateEvent_functions[] = {
+static zend_function_entry php_wxDateEvent_functions[] = {
 	PHP_ME(php_wxDateEvent, GetDate, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxDateEvent, SetDate, NULL,ZEND_ACC_PUBLIC)
 	{ NULL, NULL, NULL }
@@ -3100,7 +3100,7 @@

 extern int le_wxDateTime;

-static function_entry php_wxDateTime_functions[] = {
+static zend_function_entry php_wxDateTime_functions[] = {
 	PHP_ME(php_wxDateTime, __construct, NULL,ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	{ NULL, NULL, NULL }
 };
@@ -3130,7 +3130,7 @@

 extern int le_wxCalendarDateAttr;

-static function_entry php_wxCalendarDateAttr_functions[] = {
+static zend_function_entry php_wxCalendarDateAttr_functions[] = {
 	PHP_ME(php_wxCalendarDateAttr, __construct, NULL,ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(php_wxCalendarDateAttr, SetTextColour, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxCalendarDateAttr, SetBackgroundColour, NULL,ZEND_ACC_PUBLIC)
@@ -3174,7 +3174,7 @@

 extern int le_wxTimer;

-static function_entry php_wxTimer_functions[] = {
+static zend_function_entry php_wxTimer_functions[] = {
 	PHP_ME(php_wxTimer, __construct, NULL,ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(php_wxTimer, Start, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxTimer, Stop, NULL,ZEND_ACC_PUBLIC)
@@ -3201,7 +3201,7 @@

 extern int le_wxEvtHandler;

-static function_entry php_wxEvtHandler_functions[] = {
+static zend_function_entry php_wxEvtHandler_functions[] = {
 	PHP_ME(php_wxEvtHandler, __construct, NULL,ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(php_wxEvtHandler, Connect, NULL,ZEND_ACC_PUBLIC)
 	{ NULL, NULL, NULL }
@@ -3223,7 +3223,7 @@

 extern int le_wxTimerEvent;

-static function_entry php_wxTimerEvent_functions[] = {
+static zend_function_entry php_wxTimerEvent_functions[] = {
 	PHP_ME(php_wxEvent, GetId, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxEvent, SetEventType, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxEvent, GetEventType, NULL,ZEND_ACC_PUBLIC)
@@ -3261,7 +3261,7 @@

 extern int le_wxIPV4address;

-static function_entry php_wxIPV4address_functions[] = {
+static zend_function_entry php_wxIPV4address_functions[] = {
 	PHP_ME(php_wxSockAddress, Clear, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxIPV4address, Hostname, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxIPV4address, Service, NULL,ZEND_ACC_PUBLIC)
@@ -3285,7 +3285,7 @@

 extern int le_wxSockAddress;

-static function_entry php_wxSockAddress_functions[] = {
+static zend_function_entry php_wxSockAddress_functions[] = {
 	PHP_ME(php_wxSockAddress, Clear, NULL,ZEND_ACC_PUBLIC)
 	{ NULL, NULL, NULL }
 };
@@ -3309,7 +3309,7 @@

 extern int le_wxSocketClient;

-static function_entry php_wxSocketClient_functions[] = {
+static zend_function_entry php_wxSocketClient_functions[] = {
 	PHP_ME(php_wxSocketBase, SetEventHandler, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxSocketBase, Destroy, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxSocketBase, Close, NULL,ZEND_ACC_PUBLIC)
@@ -3337,7 +3337,7 @@

 extern int le_wxSocketBase;

-static function_entry php_wxSocketBase_functions[] = {
+static zend_function_entry php_wxSocketBase_functions[] = {
 	PHP_ME(php_wxSocketBase, SetEventHandler, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxSocketBase, Destroy, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxSocketBase, Close, NULL,ZEND_ACC_PUBLIC)
@@ -3366,7 +3366,7 @@

 extern int le_wxCheckBox;

-static function_entry php_wxCheckBox_functions[] = {
+static zend_function_entry php_wxCheckBox_functions[] = {
 	PHP_ME(php_wxWindow, Show, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxWindow, Create, NULL,ZEND_ACC_PUBLIC)
 	PHP_ME(php_wxWindow, Destroy, NULL,ZEND_ACC_PUBLIC)

Modified: pecl/wxwidgets/trunk/srcMaker/parser.php
===================================================================
--- pecl/wxwidgets/trunk/srcMaker/parser.php	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/wxwidgets/trunk/srcMaker/parser.php	2010-03-31 20:39:48 UTC (rev 297236)
@@ -2336,7 +2336,7 @@

 extern int le_<?=$className?>;

-static function_entry php_<?=$className?>_functions[] = {
+static zend_function_entry php_<?=$className?>_functions[] = {
 <?
 		funcsOfClass($className,1);
 ?>

Modified: pecl/wxwidgets/trunk/srcMaker/wxwidgets.c
===================================================================
--- pecl/wxwidgets/trunk/srcMaker/wxwidgets.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/wxwidgets/trunk/srcMaker/wxwidgets.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -188,7 +188,7 @@
 	RETVAL_LONG(wxEntry(argc,argv));
 }

-static function_entry php_wxWidgets_functions[] = {
+static zend_function_entry php_wxWidgets_functions[] = {
 	PHP_FALIAS(wxInitialize, php_wxInitialize, NULL)
 	PHP_FALIAS(wxEntry, php_wxEntry, NULL)
 	{ NULL, NULL, NULL }

Modified: pecl/wxwidgets/trunk/wxwidgets.c
===================================================================
--- pecl/wxwidgets/trunk/wxwidgets.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/wxwidgets/trunk/wxwidgets.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -188,7 +188,7 @@
 	RETVAL_LONG(wxEntry(argc,argv));
 }

-static function_entry php_wxWidgets_functions[] = {
+static zend_function_entry php_wxWidgets_functions[] = {
 	PHP_FALIAS(wxInitialize, php_wxInitialize, NULL)
 	PHP_FALIAS(wxEntry, php_wxEntry, NULL)
 	{ NULL, NULL, NULL }

Modified: pecl/xattr/trunk/xattr.c
===================================================================
--- pecl/xattr/trunk/xattr.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/xattr/trunk/xattr.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -47,7 +47,7 @@
  *
  * Every user visible function must have an entry in xattr_functions[].
  */
-function_entry xattr_functions[] = {
+zend_function_entry xattr_functions[] = {
 	PHP_FE(xattr_set,		NULL)
 	PHP_FE(xattr_get,		NULL)
 	PHP_FE(xattr_remove,	NULL)

Modified: pecl/xdiff/trunk/xdiff.c
===================================================================
--- pecl/xdiff/trunk/xdiff.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/xdiff/trunk/xdiff.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -90,7 +90,7 @@
  *
  * Every user visible function must have an entry in xdiff_functions[].
  */
-function_entry xdiff_functions[] = {
+zend_function_entry xdiff_functions[] = {
 	PHP_FE(xdiff_file_diff,				NULL)
 	PHP_FE(xdiff_file_bdiff,			NULL)
 	PHP_FE(xdiff_file_patch,			NULL)

Modified: pecl/xmgrace/trunk/xmgrace.c
===================================================================
--- pecl/xmgrace/trunk/xmgrace.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/xmgrace/trunk/xmgrace.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -49,7 +49,7 @@
  *
  * Every user visible function must have an entry in xmgrace_functions[].
  */
-function_entry xmgrace_functions[] = {
+zend_function_entry xmgrace_functions[] = {
 	PHP_FE(xmgrace_open,	NULL)
 	/* PHP_FE(xmgrace_open_visual,	NULL) */
 	PHP_FE(xmgrace_is_open,	NULL)

Modified: pecl/xmlrpci/trunk/xmlrpci.c
===================================================================
--- pecl/xmlrpci/trunk/xmlrpci.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/xmlrpci/trunk/xmlrpci.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -29,21 +29,21 @@
 static zend_object_handlers xmlrpci_object_handlers_val;
 static zend_object_handlers xmlrpci_object_handlers_server;

-function_entry xmlrpci_functions[] = {
+zend_function_entry xmlrpci_functions[] = {
 	{NULL, NULL, NULL}
 };

-function_entry xmlrpci_funcs_rpc[] = {
+zend_function_entry xmlrpci_funcs_rpc[] = {
     XMLRPCI_RPC_ME(__construct, NULL)
 	{NULL, NULL, NULL}
 };

-function_entry xmlrpci_funcs_val[] = {
+zend_function_entry xmlrpci_funcs_val[] = {
     XMLRPCI_VAL_ME(__construct, NULL)
 	{NULL, NULL, NULL}
 };

-function_entry xmlrpci_funcs_server[] = {
+zend_function_entry xmlrpci_funcs_server[] = {
 	XMLRPCI_SERVER_ME(handle, NULL)
 	XMLRPCI_SERVER_ME(setClass, NULL)
 	XMLRPCI_SERVER_ME(addFunction, NULL)

Modified: pecl/xmms/trunk/xmms.c
===================================================================
--- pecl/xmms/trunk/xmms.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/xmms/trunk/xmms.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -33,7 +33,7 @@
  *
  * Every user visible function must have an entry in xmms_functions[].
  */
-function_entry xmms_functions[] = {
+zend_function_entry xmms_functions[] = {
 	PHP_STATIC_FE("xmms_start", php_xmms_start,	NULL)
 	PHP_FE(xmms_is_running,	NULL)
 	PHP_FE(xmms_playlist_length,	NULL)

Modified: pecl/xrange/trunk/xrange.c
===================================================================
--- pecl/xrange/trunk/xrange.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/xrange/trunk/xrange.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -70,7 +70,7 @@

 /* {{{ XRangeIterator methods */
 zend_class_entry *php_xrange_xri_entry;
-static function_entry php_xrange_xri_functions[] = {
+static zend_function_entry php_xrange_xri_functions[] = {
 	PHP_ME(
 		PHP_XRANGE_XRI_NAME, __construct,
 		NULL, ZEND_ACC_PUBLIC | ZEND_ACC_CTOR
@@ -90,7 +90,7 @@

 /* {{{ OddFilterIterator methods */
 zend_class_entry *php_xrange_OddFilterIterator_entry;
-static function_entry php_xrange_OddFilterIterator_functions[] = {
+static zend_function_entry php_xrange_OddFilterIterator_functions[] = {
 	PHP_ME(PHP_XRANGE_ODDFILTERITERATOR_NAME, accept, NULL, ZEND_ACC_PUBLIC)
 	{NULL, NULL, NULL} /* Must be last */
 };
@@ -98,7 +98,7 @@

 /* {{{ EvenFilterIterator methods */
 zend_class_entry *php_xrange_EvenFilterIterator_entry;
-static function_entry php_xrange_EvenFilterIterator_functions[] = {
+static zend_function_entry php_xrange_EvenFilterIterator_functions[] = {
 	PHP_ME(PHP_XRANGE_EVENFILTERITERATOR_NAME, accept, NULL, ZEND_ACC_PUBLIC)
 	{NULL, NULL, NULL} /* Must be last */
 };
@@ -106,7 +106,7 @@

 /* {{{ NumericFilterIterator methods */
 zend_class_entry *php_xrange_NumericFilterIterator_entry;
-static function_entry php_xrange_NumericFilterIterator_functions[] = {
+static zend_function_entry php_xrange_NumericFilterIterator_functions[] = {
 	PHP_ME(PHP_XRANGE_NUMERICFILTERITERATOR_NAME, accept, NULL, ZEND_ACC_PUBLIC)
 	{NULL, NULL, NULL} /* Must be last */
 };

Modified: pecl/xslt/trunk/sablot.c
===================================================================
--- pecl/xslt/trunk/sablot.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/xslt/trunk/sablot.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -81,7 +81,7 @@
  */
 static unsigned char second_args_force_ref[] = { 2, BYREF_NONE, BYREF_FORCE };

-function_entry xslt_functions[] = {
+zend_function_entry xslt_functions[] = {
 	PHP_FE(xslt_create,              NULL)
 	PHP_FE(xslt_set_sax_handlers,    NULL)
 	PHP_FE(xslt_set_scheme_handlers, NULL)

Modified: pecl/yami/trunk/php_yami.c
===================================================================
--- pecl/yami/trunk/php_yami.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/yami/trunk/php_yami.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -560,7 +560,7 @@
 /* ------------------------------------------------------------------------- */

 /* {{{ PHP Yami Userland Function Entry Points */
-static function_entry yami_functions[] = {
+static zend_function_entry yami_functions[] = {
     PHP_FE(yami_get_last_error, NULL)
     PHP_FE(yami_get_error_string, NULL)
     PHP_FE(yami_send_to, NULL)

Modified: pecl/yaz/trunk/php_yaz.c
===================================================================
--- pecl/yaz/trunk/php_yaz.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/yaz/trunk/php_yaz.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -141,7 +141,7 @@
 #endif


-function_entry yaz_functions [] = {
+zend_function_entry yaz_functions [] = {
 	PHP_FE(yaz_connect, NULL)
 	PHP_FE(yaz_close, NULL)
 	PHP_FE(yaz_search, NULL)

Modified: pecl/yp/trunk/yp.c
===================================================================
--- pecl/yp/trunk/yp.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/yp/trunk/yp.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -41,7 +41,7 @@

 /* }}} */

-function_entry yp_functions[] = {
+zend_function_entry yp_functions[] = {
 	PHP_FE(yp_get_default_domain, NULL)
 	PHP_FE(yp_order, NULL)
 	PHP_FE(yp_master, NULL)

Modified: pecl/zeroconf/trunk/zeroconf.c
===================================================================
--- pecl/zeroconf/trunk/zeroconf.c	2010-03-31 20:39:12 UTC (rev 297235)
+++ pecl/zeroconf/trunk/zeroconf.c	2010-03-31 20:39:48 UTC (rev 297236)
@@ -309,7 +309,7 @@
 	zval_ptr_dtor(&session->callback);
 }
 /* {{{ zeroconf_functions[] */
-function_entry zeroconf_functions[] = {
+zend_function_entry zeroconf_functions[] = {
 	PHP_FE(zeroconf_register_service, NULL)
 	PHP_FE(zeroconf_browse_service, NULL)
 	PHP_FE(zeroconf_get_all_services, NULL)