fix compile issues in LDAP/XML exts

diff --git a/ext/ldap/php3_ldap.h b/ext/ldap/php3_ldap.h
index d16ab563827147ecf40c999aeac0db01993f199b..341cca1ec3b0a29c2f0536be88732b5caec2eb8f 100644 (file)
--- a/ext/ldap/php3_ldap.h
+++ b/ext/ldap/php3_ldap.h
@@ -85,6 +85,10 @@ PHP_FUNCTION(ldap_add);
 PHP_FUNCTION(ldap_delete);
 PHP_FUNCTION(ldap_modify);
 
+PHP_FUNCTION(ldap_mod_add);
+PHP_FUNCTION(ldap_mod_replace);
+PHP_FUNCTION(ldap_mod_del);
+
 typedef struct {
        long default_link;
        long num_links, max_links;

diff --git a/ext/xml/php3_xml.h b/ext/xml/php3_xml.h
index df08100d0b1aa578d96c784dfa377989f15bcbc2..4c1a2f4020213c0a82dcf1598eac694025778b59 100644 (file)
--- a/ext/xml/php3_xml.h
+++ b/ext/xml/php3_xml.h
@@ -27,7 +27,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id */
+/* $Id$ */
 
 #if HAVE_LIBEXPAT
 # ifndef _PHP_XML_H
@@ -60,6 +60,17 @@ typedef struct {
        char *notationDeclHandler;
        char *externalEntityRefHandler;
        char *unknownEncodingHandler;
+
+       pval *data;
+       pval *info;
+       int level;
+       int toffset;
+       int curtag;
+       pval *ctag;
+       char **ltags;
+       int lastwasopen;
+       int skipwhite;
+       
        XML_Char *baseURI;
 } xml_parser;
 
@@ -67,7 +78,7 @@ typedef struct {
 typedef struct {
        XML_Char *name;
        char (*decoding_function)(unsigned short);
-       unsigned short (*encoding_function)(char);
+       unsigned short (*encoding_function)(unsigned char);
 } xml_encoding;
 
 
@@ -75,14 +86,20 @@ extern php3_module_entry xml_module_entry;
 # define xml_module_ptr &xml_module_entry
 
 enum php3_xml_option {
-    PHP3_XML_OPTION_CASE_FOLDING,
-    PHP3_XML_OPTION_TARGET_ENCODING
+    PHP3_XML_OPTION_CASE_FOLDING = 1,
+    PHP3_XML_OPTION_TARGET_ENCODING,
+    PHP3_XML_OPTION_SKIP_TAGSTART,
+    PHP3_XML_OPTION_SKIP_WHITE
 };
 
 # define RETURN_OUT_OF_MEMORY \
        php3_error(E_WARNING, "Out of memory");\
        RETURN_FALSE
 
+/* for xml_parse_into_struct */
+       
+#define XML_MAXLEVEL 255 /* XXX this should be dynamic */
+       
 PHP_FUNCTION(xml_parser_create);
 PHP_FUNCTION(xml_set_element_handler);
 PHP_FUNCTION(xml_set_character_data_handler);
@@ -102,6 +119,7 @@ PHP_FUNCTION(xml_parser_set_option);
 PHP_FUNCTION(xml_parser_get_option);
 PHP_FUNCTION(utf8_encode);
 PHP_FUNCTION(utf8_decode);
+PHP_FUNCTION(xml_parse_into_struct);
 
 #else /* !HAVE_LIBEXPAT */
 

diff --git a/ext/xml/xml.c b/ext/xml/xml.c
index f8127e8bd89051ae5bd548fb30164b7c423be2a8..be4fe3b11019cbc9b559ba6e83cf0d514d1f35bc 100644 (file)
--- a/ext/xml/xml.c
+++ b/ext/xml/xml.c
@@ -51,7 +51,6 @@
 # endif
 # include "snprintf.h"
 # include "ext/standard/head.h"
-# include "php3_string.h"
 
 /* Short-term TODO list:
  * - Implement XML_ExternalEntityParserCreate()