From bca35ffcb7edf7db6242e81787c8192040556a3c Mon Sep 17 00:00:00 2001
From: Hartmut Holzgraefe <hholzgra@php.net>
Date: Sat, 14 Jan 2006 20:08:53 +0000
Subject: [PATCH] started to manually fix macro prototypes (this information
 can't be extracted by zendapi_macros.php)

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@205272 c90b9560-bf6c-de11-be94-00142212c4b1
---
 internals/zendapi/macros/RETURN_BOOL.xml          | 6 +++---
 internals/zendapi/macros/RETURN_DOUBLE.xml        | 6 +++---
 internals/zendapi/macros/RETURN_EMPTY_BINARY.xml  | 5 ++---
 internals/zendapi/macros/RETURN_EMPTY_STRING.xml  | 5 ++---
 internals/zendapi/macros/RETURN_EMPTY_UNICODE.xml | 5 ++---
 internals/zendapi/macros/RETURN_LONG.xml          | 6 +++---
 internals/zendapi/macros/RETURN_NULL.xml          | 5 ++---
 internals/zendapi/macros/Z_ARRVAL.xml             | 6 +++---
 internals/zendapi/macros/Z_ARRVAL_P.xml           | 6 +++---
 internals/zendapi/macros/Z_ARRVAL_PP.xml          | 6 +++---
 internals/zendapi/macros/Z_BINLEN.xml             | 6 +++---
 internals/zendapi/macros/Z_BINLEN_P.xml           | 6 +++---
 internals/zendapi/macros/Z_BINLEN_PP.xml          | 6 +++---
 internals/zendapi/macros/Z_BVAL.xml               | 8 ++++----
 internals/zendapi/macros/Z_BVAL_P.xml             | 8 ++++----
 internals/zendapi/macros/Z_BVAL_PP.xml            | 8 ++++----
 internals/zendapi/macros/Z_DVAL.xml               | 8 ++++----
 internals/zendapi/macros/Z_DVAL_P.xml             | 8 ++++----
 internals/zendapi/macros/Z_DVAL_PP.xml            | 8 ++++----
 internals/zendapi/macros/Z_LVAL.xml               | 6 +++---
 internals/zendapi/macros/Z_LVAL_P.xml             | 6 +++---
 internals/zendapi/macros/Z_LVAL_PP.xml            | 8 ++++----
 internals/zendapi/macros/Z_STRLEN.xml             | 6 +++---
 internals/zendapi/macros/Z_STRLEN_P.xml           | 6 +++---
 internals/zendapi/macros/Z_STRLEN_PP.xml          | 6 +++---
 internals/zendapi/macros/Z_STRVAL.xml             | 6 +++---
 internals/zendapi/macros/Z_STRVAL_P.xml           | 6 +++---
 internals/zendapi/macros/Z_STRVAL_PP.xml          | 6 +++---
 internals/zendapi/macros/Z_TYPE.xml               | 6 +++---
 internals/zendapi/macros/Z_TYPE_P.xml             | 6 +++---
 internals/zendapi/macros/Z_TYPE_PP.xml            | 6 +++---
 internals/zendapi/macros/Z_UNILEN.xml             | 6 +++---
 internals/zendapi/macros/Z_UNILEN_P.xml           | 6 +++---
 internals/zendapi/macros/Z_UNILEN_PP.xml          | 6 +++---
 internals/zendapi/macros/Z_UNIVAL.xml             | 6 +++---
 internals/zendapi/macros/Z_UNIVAL_P.xml           | 6 +++---
 internals/zendapi/macros/Z_UNIVAL_PP.xml          | 6 +++---
 internals/zendapi/macros/Z_USTRCPLEN.xml          | 6 +++---
 internals/zendapi/macros/Z_USTRCPLEN_P.xml        | 6 +++---
 internals/zendapi/macros/Z_USTRCPLEN_PP.xml       | 6 +++---
 internals/zendapi/macros/Z_USTRLEN.xml            | 6 +++---
 internals/zendapi/macros/Z_USTRLEN_P.xml          | 6 +++---
 internals/zendapi/macros/Z_USTRLEN_PP.xml         | 6 +++---
 internals/zendapi/macros/Z_USTRVAL.xml            | 6 +++---
 internals/zendapi/macros/Z_USTRVAL_P.xml          | 6 +++---
 internals/zendapi/macros/Z_USTRVAL_PP.xml         | 6 +++---
 46 files changed, 141 insertions(+), 145 deletions(-)

diff --git a/internals/zendapi/macros/RETURN_BOOL.xml b/internals/zendapi/macros/RETURN_BOOL.xml
index 913c903683..b3454d16ee 100644
--- a/internals/zendapi/macros/RETURN_BOOL.xml
+++ b/internals/zendapi/macros/RETURN_BOOL.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-macro.RETURN-BOOL">
  <refnamediv>
   <refname>RETURN_BOOL</refname>
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>RETURN_BOOL</methodname>
-    <methodparam><type>???</type><parameter>b</parameter></methodparam>
+   <void/><methodname>RETURN_BOOL</methodname>
+    <methodparam><type>zend_bool</type><parameter>b</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/RETURN_DOUBLE.xml b/internals/zendapi/macros/RETURN_DOUBLE.xml
index 3013c1bd43..737c5eaaa7 100644
--- a/internals/zendapi/macros/RETURN_DOUBLE.xml
+++ b/internals/zendapi/macros/RETURN_DOUBLE.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-macro.RETURN-DOUBLE">
  <refnamediv>
   <refname>RETURN_DOUBLE</refname>
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>RETURN_DOUBLE</methodname>
-    <methodparam><type>???</type><parameter>d</parameter></methodparam>
+   <void/><methodname>RETURN_DOUBLE</methodname>
+    <methodparam><type>double</type><parameter>d</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/RETURN_EMPTY_BINARY.xml b/internals/zendapi/macros/RETURN_EMPTY_BINARY.xml
index 386cefc255..198fee7de6 100644
--- a/internals/zendapi/macros/RETURN_EMPTY_BINARY.xml
+++ b/internals/zendapi/macros/RETURN_EMPTY_BINARY.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-macro.RETURN-EMPTY-BINARY">
  <refnamediv>
   <refname>RETURN_EMPTY_BINARY</refname>
@@ -9,8 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>RETURN_EMPTY_BINARY</methodname>
-    <methodparam><type>???</type><parameter></parameter></methodparam>
+   <void/><methodname>RETURN_EMPTY_BINARY</methodname><void/>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/RETURN_EMPTY_STRING.xml b/internals/zendapi/macros/RETURN_EMPTY_STRING.xml
index 98f6c3d3e1..afcf5ab2cf 100644
--- a/internals/zendapi/macros/RETURN_EMPTY_STRING.xml
+++ b/internals/zendapi/macros/RETURN_EMPTY_STRING.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-macro.RETURN-EMPTY-STRING">
  <refnamediv>
   <refname>RETURN_EMPTY_STRING</refname>
@@ -9,8 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>RETURN_EMPTY_STRING</methodname>
-    <methodparam><type>???</type><parameter></parameter></methodparam>
+   <void/><methodname>RETURN_EMPTY_STRING</methodname><void/>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/RETURN_EMPTY_UNICODE.xml b/internals/zendapi/macros/RETURN_EMPTY_UNICODE.xml
index 595e32c775..45887f3c29 100644
--- a/internals/zendapi/macros/RETURN_EMPTY_UNICODE.xml
+++ b/internals/zendapi/macros/RETURN_EMPTY_UNICODE.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-macro.RETURN-EMPTY-UNICODE">
  <refnamediv>
   <refname>RETURN_EMPTY_UNICODE</refname>
@@ -9,8 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>RETURN_EMPTY_UNICODE</methodname>
-    <methodparam><type>???</type><parameter></parameter></methodparam>
+   <void/><methodname>RETURN_EMPTY_UNICODE</methodname><void/>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/RETURN_LONG.xml b/internals/zendapi/macros/RETURN_LONG.xml
index 8e260a343b..a9b54f3ac4 100644
--- a/internals/zendapi/macros/RETURN_LONG.xml
+++ b/internals/zendapi/macros/RETURN_LONG.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-macro.RETURN-LONG">
  <refnamediv>
   <refname>RETURN_LONG</refname>
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>RETURN_LONG</methodname>
-    <methodparam><type>???</type><parameter>l</parameter></methodparam>
+   <void/><methodname>RETURN_LONG</methodname>
+    <methodparam><type>long</type><parameter>l</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/RETURN_NULL.xml b/internals/zendapi/macros/RETURN_NULL.xml
index 994205b813..09d3fbeb03 100644
--- a/internals/zendapi/macros/RETURN_NULL.xml
+++ b/internals/zendapi/macros/RETURN_NULL.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-macro.RETURN-NULL">
  <refnamediv>
   <refname>RETURN_NULL</refname>
@@ -9,8 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>RETURN_NULL</methodname>
-    <methodparam><type>???</type><parameter></parameter></methodparam>
+   <void/><methodname>RETURN_NULL</methodname><void/>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/Z_ARRVAL.xml b/internals/zendapi/macros/Z_ARRVAL.xml
index 73e7401868..667940e6c2 100644
--- a/internals/zendapi/macros/Z_ARRVAL.xml
+++ b/internals/zendapi/macros/Z_ARRVAL.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <refentry id="zend-macro.Z-ARRVAL">
  <refnamediv>
   <refname>Z_ARRVAL</refname>
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>Z_ARRVAL</methodname>
-    <methodparam><type>???</type><parameter>zval</parameter></methodparam>
+   <type>HashTable</type><methodname>Z_ARRVAL</methodname>
+    <methodparam><type>zval</type><parameter>zval</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/Z_ARRVAL_P.xml b/internals/zendapi/macros/Z_ARRVAL_P.xml
index 8187c32661..c9558906f7 100644
--- a/internals/zendapi/macros/Z_ARRVAL_P.xml
+++ b/internals/zendapi/macros/Z_ARRVAL_P.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <refentry id="zend-macro.Z-ARRVAL-P">
  <refnamediv>
   <refname>Z_ARRVAL_P</refname>
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>Z_ARRVAL_P</methodname>
-    <methodparam><type>???</type><parameter>zval_p</parameter></methodparam>
+   <type>HashTable</type><methodname>Z_ARRVAL_P</methodname>
+    <methodparam><type>zval *</type><parameter>zval_p</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/Z_ARRVAL_PP.xml b/internals/zendapi/macros/Z_ARRVAL_PP.xml
index 46db22c9d7..b213767e03 100644
--- a/internals/zendapi/macros/Z_ARRVAL_PP.xml
+++ b/internals/zendapi/macros/Z_ARRVAL_PP.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <refentry id="zend-macro.Z-ARRVAL-PP">
  <refnamediv>
   <refname>Z_ARRVAL_PP</refname>
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>Z_ARRVAL_PP</methodname>
-    <methodparam><type>???</type><parameter>zval_pp</parameter></methodparam>
+   <type>HashTable</type><methodname>Z_ARRVAL_PP</methodname>
+    <methodparam><type>zval **</type><parameter>zval_pp</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/Z_BINLEN.xml b/internals/zendapi/macros/Z_BINLEN.xml
index 82f90eba9c..c89c37dfaf 100644
--- a/internals/zendapi/macros/Z_BINLEN.xml
+++ b/internals/zendapi/macros/Z_BINLEN.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-macro.Z-BINLEN">
  <refnamediv>
   <refname>Z_BINLEN</refname>
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>Z_BINLEN</methodname>
-    <methodparam><type>???</type><parameter>zval</parameter></methodparam>
+   <type>char *</type><methodname>Z_BINLEN</methodname>
+    <methodparam><type>zval</type><parameter>zval</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/Z_BINLEN_P.xml b/internals/zendapi/macros/Z_BINLEN_P.xml
index d7bb0b10cb..d820db1ae8 100644
--- a/internals/zendapi/macros/Z_BINLEN_P.xml
+++ b/internals/zendapi/macros/Z_BINLEN_P.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-macro.Z-BINLEN-P">
  <refnamediv>
   <refname>Z_BINLEN_P</refname>
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>Z_BINLEN_P</methodname>
-    <methodparam><type>???</type><parameter>zval</parameter></methodparam>
+   <type>char *</type><methodname>Z_BINLEN_P</methodname>
+    <methodparam><type>zval *</type><parameter>zval</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/Z_BINLEN_PP.xml b/internals/zendapi/macros/Z_BINLEN_PP.xml
index 47002b3ca1..1907850600 100644
--- a/internals/zendapi/macros/Z_BINLEN_PP.xml
+++ b/internals/zendapi/macros/Z_BINLEN_PP.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-macro.Z-BINLEN-PP">
  <refnamediv>
   <refname>Z_BINLEN_PP</refname>
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>Z_BINLEN_PP</methodname>
-    <methodparam><type>???</type><parameter>zval</parameter></methodparam>
+   <type>char *</type><methodname>Z_BINLEN_PP</methodname>
+    <methodparam><type>zval **</type><parameter>zval</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/Z_BVAL.xml b/internals/zendapi/macros/Z_BVAL.xml
index b73eef7aec..59515d4c1b 100644
--- a/internals/zendapi/macros/Z_BVAL.xml
+++ b/internals/zendapi/macros/Z_BVAL.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <refentry id="zend-macro.Z-BVAL">
  <refnamediv>
   <refname>Z_BVAL</refname>
-  <refpurpose>...</refpurpose>
+  <refpurpose>Return a <type>zval</type> <varname>lval</varname> element as <type>bool</type></refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>Z_BVAL</methodname>
-    <methodparam><type>???</type><parameter>zval</parameter></methodparam>
+   <type>zend_bool</type><methodname>Z_BVAL</methodname>
+    <methodparam><type>zval</type><parameter>zval</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/Z_BVAL_P.xml b/internals/zendapi/macros/Z_BVAL_P.xml
index 3c57aa3cba..42947ee73b 100644
--- a/internals/zendapi/macros/Z_BVAL_P.xml
+++ b/internals/zendapi/macros/Z_BVAL_P.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <refentry id="zend-macro.Z-BVAL-P">
  <refnamediv>
   <refname>Z_BVAL_P</refname>
-  <refpurpose>...</refpurpose>
+  <refpurpose>Dereference a <type>zval</type> pointer and return its <varname>lval</varname> element as <type>bool</type></refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>Z_BVAL_P</methodname>
-    <methodparam><type>???</type><parameter>zval_p</parameter></methodparam>
+   <type>zend_bool</type><methodname>Z_BVAL_P</methodname>
+    <methodparam><type>zval *</type><parameter>zval_p</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/Z_BVAL_PP.xml b/internals/zendapi/macros/Z_BVAL_PP.xml
index ddf86dd295..f313eb5fe8 100644
--- a/internals/zendapi/macros/Z_BVAL_PP.xml
+++ b/internals/zendapi/macros/Z_BVAL_PP.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <refentry id="zend-macro.Z-BVAL-PP">
  <refnamediv>
   <refname>Z_BVAL_PP</refname>
-  <refpurpose>...</refpurpose>
+  <refpurpose>Dereference a pointer to a <type>zval</type> pointer and return its <varname>lval</varname> element as <type>bool</type></refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>Z_BVAL_PP</methodname>
-    <methodparam><type>???</type><parameter>zval_pp</parameter></methodparam>
+   <type>zend_bool</type><methodname>Z_BVAL_PP</methodname>
+    <methodparam><type>zval **</type><parameter>zval_pp</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/Z_DVAL.xml b/internals/zendapi/macros/Z_DVAL.xml
index be4d6b384e..22672e61de 100644
--- a/internals/zendapi/macros/Z_DVAL.xml
+++ b/internals/zendapi/macros/Z_DVAL.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <refentry id="zend-macro.Z-DVAL">
  <refnamediv>
   <refname>Z_DVAL</refname>
-  <refpurpose>...</refpurpose>
+  <refpurpose>Return the dval element of a zval</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>Z_DVAL</methodname>
-    <methodparam><type>???</type><parameter>zval</parameter></methodparam>
+   <type>double</type><methodname>Z_DVAL</methodname>
+    <methodparam><type>zval</type><parameter>zval</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/Z_DVAL_P.xml b/internals/zendapi/macros/Z_DVAL_P.xml
index 13792240af..791a65c40b 100644
--- a/internals/zendapi/macros/Z_DVAL_P.xml
+++ b/internals/zendapi/macros/Z_DVAL_P.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <refentry id="zend-macro.Z-DVAL-P">
  <refnamediv>
   <refname>Z_DVAL_P</refname>
-  <refpurpose>...</refpurpose>
+  <refpurpose>Dereference a <type>zval</type> pointer and return its <varname>dval</varname> element</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>Z_DVAL_P</methodname>
-    <methodparam><type>???</type><parameter>zval_p</parameter></methodparam>
+   <type>double</type><methodname>Z_DVAL_P</methodname>
+    <methodparam><type>zval *</type><parameter>zval_p</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/Z_DVAL_PP.xml b/internals/zendapi/macros/Z_DVAL_PP.xml
index 7679c48124..9b4ef2e16f 100644
--- a/internals/zendapi/macros/Z_DVAL_PP.xml
+++ b/internals/zendapi/macros/Z_DVAL_PP.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <refentry id="zend-macro.Z-DVAL-PP">
  <refnamediv>
   <refname>Z_DVAL_PP</refname>
-  <refpurpose>...</refpurpose>
+  <refpurpose>Dereference a pointer to a <type>zval</type> pointer and return its <varname>dval</varname> element</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>Z_DVAL_PP</methodname>
-    <methodparam><type>???</type><parameter>zval_pp</parameter></methodparam>
+   <type>double</type><methodname>Z_DVAL_PP</methodname>
+    <methodparam><type>zval **</type><parameter>zval_pp</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/Z_LVAL.xml b/internals/zendapi/macros/Z_LVAL.xml
index bb923edd14..13d0d5a0f6 100644
--- a/internals/zendapi/macros/Z_LVAL.xml
+++ b/internals/zendapi/macros/Z_LVAL.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <refentry id="zend-macro.Z-LVAL">
  <refnamediv>
   <refname>Z_LVAL</refname>
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>Z_LVAL</methodname>
-    <methodparam><type>???</type><parameter>zval</parameter></methodparam>
+   <type>long</type><methodname>Z_LVAL</methodname>
+    <methodparam><type>zval</type><parameter>zval</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/Z_LVAL_P.xml b/internals/zendapi/macros/Z_LVAL_P.xml
index 4629462c03..64e489c433 100644
--- a/internals/zendapi/macros/Z_LVAL_P.xml
+++ b/internals/zendapi/macros/Z_LVAL_P.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <refentry id="zend-macro.Z-LVAL-P">
  <refnamediv>
   <refname>Z_LVAL_P</refname>
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>Z_LVAL_P</methodname>
-    <methodparam><type>???</type><parameter>zval_p</parameter></methodparam>
+   <type>long</type><methodname>Z_LVAL_P</methodname>
+    <methodparam><type>zval *</type><parameter>zval_p</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/Z_LVAL_PP.xml b/internals/zendapi/macros/Z_LVAL_PP.xml
index d3e4f5690a..b3363141c4 100644
--- a/internals/zendapi/macros/Z_LVAL_PP.xml
+++ b/internals/zendapi/macros/Z_LVAL_PP.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <refentry id="zend-macro.Z-LVAL-PP">
  <refnamediv>
   <refname>Z_LVAL_PP</refname>
-  <refpurpose>...</refpurpose>
+  <refpurpose>Dereference a pointer to a <type>zval</type> pointer and return its <varname>lval</varname> element</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>Z_LVAL_PP</methodname>
-    <methodparam><type>???</type><parameter>zval_pp</parameter></methodparam>
+   <type>long</type><methodname>Z_LVAL_PP</methodname>
+    <methodparam><type>zval **</type><parameter>zval_pp</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/Z_STRLEN.xml b/internals/zendapi/macros/Z_STRLEN.xml
index 9d7be70124..1cc80d5720 100644
--- a/internals/zendapi/macros/Z_STRLEN.xml
+++ b/internals/zendapi/macros/Z_STRLEN.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <refentry id="zend-macro.Z-STRLEN">
  <refnamediv>
   <refname>Z_STRLEN</refname>
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>Z_STRLEN</methodname>
-    <methodparam><type>???</type><parameter>zval</parameter></methodparam>
+   <type>int</type><methodname>Z_STRLEN</methodname>
+    <methodparam><type>zval</type><parameter>zval</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/Z_STRLEN_P.xml b/internals/zendapi/macros/Z_STRLEN_P.xml
index 97819cc507..c594b713ab 100644
--- a/internals/zendapi/macros/Z_STRLEN_P.xml
+++ b/internals/zendapi/macros/Z_STRLEN_P.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <refentry id="zend-macro.Z-STRLEN-P">
  <refnamediv>
   <refname>Z_STRLEN_P</refname>
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>Z_STRLEN_P</methodname>
-    <methodparam><type>???</type><parameter>zval_p</parameter></methodparam>
+   <type>int</type><methodname>Z_STRLEN_P</methodname>
+    <methodparam><type>zval *</type><parameter>zval_p</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/Z_STRLEN_PP.xml b/internals/zendapi/macros/Z_STRLEN_PP.xml
index abc1b30f3e..411ec79aa8 100644
--- a/internals/zendapi/macros/Z_STRLEN_PP.xml
+++ b/internals/zendapi/macros/Z_STRLEN_PP.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <refentry id="zend-macro.Z-STRLEN-PP">
  <refnamediv>
   <refname>Z_STRLEN_PP</refname>
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>Z_STRLEN_PP</methodname>
-    <methodparam><type>???</type><parameter>zval_pp</parameter></methodparam>
+   <type>int</type><methodname>Z_STRLEN_PP</methodname>
+    <methodparam><type>zval **</type><parameter>zval_pp</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/Z_STRVAL.xml b/internals/zendapi/macros/Z_STRVAL.xml
index 6e3f9c3649..63bb566649 100644
--- a/internals/zendapi/macros/Z_STRVAL.xml
+++ b/internals/zendapi/macros/Z_STRVAL.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <refentry id="zend-macro.Z-STRVAL">
  <refnamediv>
   <refname>Z_STRVAL</refname>
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>Z_STRVAL</methodname>
-    <methodparam><type>???</type><parameter>zval</parameter></methodparam>
+   <type>char *</type><methodname>Z_STRVAL</methodname>
+    <methodparam><type>zval</type><parameter>zval</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/Z_STRVAL_P.xml b/internals/zendapi/macros/Z_STRVAL_P.xml
index 7a2bff2892..5130b8c654 100644
--- a/internals/zendapi/macros/Z_STRVAL_P.xml
+++ b/internals/zendapi/macros/Z_STRVAL_P.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <refentry id="zend-macro.Z-STRVAL-P">
  <refnamediv>
   <refname>Z_STRVAL_P</refname>
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>Z_STRVAL_P</methodname>
-    <methodparam><type>???</type><parameter>zval_p</parameter></methodparam>
+   <type>char *</type><methodname>Z_STRVAL_P</methodname>
+    <methodparam><type>zval *</type><parameter>zval_p</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/Z_STRVAL_PP.xml b/internals/zendapi/macros/Z_STRVAL_PP.xml
index b2705402ba..dc0e6d01b0 100644
--- a/internals/zendapi/macros/Z_STRVAL_PP.xml
+++ b/internals/zendapi/macros/Z_STRVAL_PP.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <refentry id="zend-macro.Z-STRVAL-PP">
  <refnamediv>
   <refname>Z_STRVAL_PP</refname>
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>Z_STRVAL_PP</methodname>
-    <methodparam><type>???</type><parameter>zval_pp</parameter></methodparam>
+   <type>char *</type><methodname>Z_STRVAL_PP</methodname>
+    <methodparam><type>zval **</type><parameter>zval_pp</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/Z_TYPE.xml b/internals/zendapi/macros/Z_TYPE.xml
index 14f60b0a49..15133a971b 100644
--- a/internals/zendapi/macros/Z_TYPE.xml
+++ b/internals/zendapi/macros/Z_TYPE.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <refentry id="zend-macro.Z-TYPE">
  <refnamediv>
   <refname>Z_TYPE</refname>
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>Z_TYPE</methodname>
-    <methodparam><type>???</type><parameter>zval</parameter></methodparam>
+   <type>zend_uchar</type><methodname>Z_TYPE</methodname>
+    <methodparam><type>zval</type><parameter>zval</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/Z_TYPE_P.xml b/internals/zendapi/macros/Z_TYPE_P.xml
index 71dbb8156a..23b49d99b4 100644
--- a/internals/zendapi/macros/Z_TYPE_P.xml
+++ b/internals/zendapi/macros/Z_TYPE_P.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <refentry id="zend-macro.Z-TYPE-P">
  <refnamediv>
   <refname>Z_TYPE_P</refname>
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>Z_TYPE_P</methodname>
-    <methodparam><type>???</type><parameter>zval_p</parameter></methodparam>
+   <type>zend_uchar</type><methodname>Z_TYPE_P</methodname>
+    <methodparam><type>zval *</type><parameter>zval_p</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/Z_TYPE_PP.xml b/internals/zendapi/macros/Z_TYPE_PP.xml
index e2de84fa03..611dc4638a 100644
--- a/internals/zendapi/macros/Z_TYPE_PP.xml
+++ b/internals/zendapi/macros/Z_TYPE_PP.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <refentry id="zend-macro.Z-TYPE-PP">
  <refnamediv>
   <refname>Z_TYPE_PP</refname>
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>Z_TYPE_PP</methodname>
-    <methodparam><type>???</type><parameter>zval_pp</parameter></methodparam>
+   <type>zend_uchar</type><methodname>Z_TYPE_PP</methodname>
+    <methodparam><type>zval **</type><parameter>zval_pp</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/Z_UNILEN.xml b/internals/zendapi/macros/Z_UNILEN.xml
index 441e6f1684..6322d15b2d 100644
--- a/internals/zendapi/macros/Z_UNILEN.xml
+++ b/internals/zendapi/macros/Z_UNILEN.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-macro.Z-UNILEN">
  <refnamediv>
   <refname>Z_UNILEN</refname>
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>Z_UNILEN</methodname>
-    <methodparam><type>???</type><parameter>zval</parameter></methodparam>
+   <type>int</type><methodname>Z_UNILEN</methodname><!-- actually int32_t sometimes ??-->
+    <methodparam><type>zval</type><parameter>zval</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/Z_UNILEN_P.xml b/internals/zendapi/macros/Z_UNILEN_P.xml
index 4e9a041fbd..88f00802c2 100644
--- a/internals/zendapi/macros/Z_UNILEN_P.xml
+++ b/internals/zendapi/macros/Z_UNILEN_P.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-macro.Z-UNILEN-P">
  <refnamediv>
   <refname>Z_UNILEN_P</refname>
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>Z_UNILEN_P</methodname>
-    <methodparam><type>???</type><parameter>zval_p</parameter></methodparam>
+   <type>int</type><methodname>Z_UNILEN_P</methodname>
+    <methodparam><type>zval *</type><parameter>zval_p</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/Z_UNILEN_PP.xml b/internals/zendapi/macros/Z_UNILEN_PP.xml
index 953cb58ebf..d9fe8175dd 100644
--- a/internals/zendapi/macros/Z_UNILEN_PP.xml
+++ b/internals/zendapi/macros/Z_UNILEN_PP.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-macro.Z-UNILEN-PP">
  <refnamediv>
   <refname>Z_UNILEN_PP</refname>
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>Z_UNILEN_PP</methodname>
-    <methodparam><type>???</type><parameter>zval_pp</parameter></methodparam>
+   <type>int</type><methodname>Z_UNILEN_PP</methodname>
+    <methodparam><type>zval **</type><parameter>zval_pp</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/Z_UNIVAL.xml b/internals/zendapi/macros/Z_UNIVAL.xml
index 5fe1b3aa3f..fc39a96dea 100644
--- a/internals/zendapi/macros/Z_UNIVAL.xml
+++ b/internals/zendapi/macros/Z_UNIVAL.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-macro.Z-UNIVAL">
  <refnamediv>
   <refname>Z_UNIVAL</refname>
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>Z_UNIVAL</methodname>
-    <methodparam><type>???</type><parameter>zval</parameter></methodparam>
+   <type>char *</type><methodname>Z_UNIVAL</methodname>
+    <methodparam><type>zval</type><parameter>zval</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/Z_UNIVAL_P.xml b/internals/zendapi/macros/Z_UNIVAL_P.xml
index bef6f386a1..46ac44f50f 100644
--- a/internals/zendapi/macros/Z_UNIVAL_P.xml
+++ b/internals/zendapi/macros/Z_UNIVAL_P.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-macro.Z-UNIVAL-P">
  <refnamediv>
   <refname>Z_UNIVAL_P</refname>
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>Z_UNIVAL_P</methodname>
-    <methodparam><type>???</type><parameter>zval_p</parameter></methodparam>
+   <type>char *</type><methodname>Z_UNIVAL_P</methodname>
+    <methodparam><type>zval *</type><parameter>zval_p</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/Z_UNIVAL_PP.xml b/internals/zendapi/macros/Z_UNIVAL_PP.xml
index d20ec61785..67b6f35d64 100644
--- a/internals/zendapi/macros/Z_UNIVAL_PP.xml
+++ b/internals/zendapi/macros/Z_UNIVAL_PP.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-macro.Z-UNIVAL-PP">
  <refnamediv>
   <refname>Z_UNIVAL_PP</refname>
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>Z_UNIVAL_PP</methodname>
-    <methodparam><type>???</type><parameter>zval_pp</parameter></methodparam>
+   <type>char *</type><methodname>Z_UNIVAL_PP</methodname>
+    <methodparam><type>zval **</type><parameter>zval_pp</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/Z_USTRCPLEN.xml b/internals/zendapi/macros/Z_USTRCPLEN.xml
index 3c461ca63c..e9306de509 100644
--- a/internals/zendapi/macros/Z_USTRCPLEN.xml
+++ b/internals/zendapi/macros/Z_USTRCPLEN.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-macro.Z-USTRCPLEN">
  <refnamediv>
   <refname>Z_USTRCPLEN</refname>
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>Z_USTRCPLEN</methodname>
-    <methodparam><type>???</type><parameter>zval</parameter></methodparam>
+   <type>int32_t</type><methodname>Z_USTRCPLEN</methodname>
+    <methodparam><type>zval</type><parameter>zval</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/Z_USTRCPLEN_P.xml b/internals/zendapi/macros/Z_USTRCPLEN_P.xml
index 9b199e38e0..edbd9da4de 100644
--- a/internals/zendapi/macros/Z_USTRCPLEN_P.xml
+++ b/internals/zendapi/macros/Z_USTRCPLEN_P.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-macro.Z-USTRCPLEN-P">
  <refnamediv>
   <refname>Z_USTRCPLEN_P</refname>
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>Z_USTRCPLEN_P</methodname>
-    <methodparam><type>???</type><parameter>zval_p</parameter></methodparam>
+   <type>int32_t</type><methodname>Z_USTRCPLEN_P</methodname>
+    <methodparam><type>zval *</type><parameter>zval_p</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/Z_USTRCPLEN_PP.xml b/internals/zendapi/macros/Z_USTRCPLEN_PP.xml
index 2ebb615ea0..09a0c80375 100644
--- a/internals/zendapi/macros/Z_USTRCPLEN_PP.xml
+++ b/internals/zendapi/macros/Z_USTRCPLEN_PP.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-macro.Z-USTRCPLEN-PP">
  <refnamediv>
   <refname>Z_USTRCPLEN_PP</refname>
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>Z_USTRCPLEN_PP</methodname>
-    <methodparam><type>???</type><parameter>zval_pp</parameter></methodparam>
+   <type>int32_t</type><methodname>Z_USTRCPLEN_PP</methodname>
+    <methodparam><type>zval **</type><parameter>zval_pp</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/Z_USTRLEN.xml b/internals/zendapi/macros/Z_USTRLEN.xml
index 7c2d66e5bc..cca6be5652 100644
--- a/internals/zendapi/macros/Z_USTRLEN.xml
+++ b/internals/zendapi/macros/Z_USTRLEN.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-macro.Z-USTRLEN">
  <refnamediv>
   <refname>Z_USTRLEN</refname>
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>Z_USTRLEN</methodname>
-    <methodparam><type>???</type><parameter>zval</parameter></methodparam>
+   <type>int32_t</type><methodname>Z_USTRLEN</methodname>
+    <methodparam><type>zval</type><parameter>zval</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/Z_USTRLEN_P.xml b/internals/zendapi/macros/Z_USTRLEN_P.xml
index 27f616b3bc..851f8729a9 100644
--- a/internals/zendapi/macros/Z_USTRLEN_P.xml
+++ b/internals/zendapi/macros/Z_USTRLEN_P.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-macro.Z-USTRLEN-P">
  <refnamediv>
   <refname>Z_USTRLEN_P</refname>
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>Z_USTRLEN_P</methodname>
-    <methodparam><type>???</type><parameter>zval_p</parameter></methodparam>
+   <type>int32_t</type><methodname>Z_USTRLEN_P</methodname>
+    <methodparam><type>zval *</type><parameter>zval_p</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/Z_USTRLEN_PP.xml b/internals/zendapi/macros/Z_USTRLEN_PP.xml
index 8dac85f126..16f14f2204 100644
--- a/internals/zendapi/macros/Z_USTRLEN_PP.xml
+++ b/internals/zendapi/macros/Z_USTRLEN_PP.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-macro.Z-USTRLEN-PP">
  <refnamediv>
   <refname>Z_USTRLEN_PP</refname>
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>Z_USTRLEN_PP</methodname>
-    <methodparam><type>???</type><parameter>zval_pp</parameter></methodparam>
+   <type>int32_t</type><methodname>Z_USTRLEN_PP</methodname>
+    <methodparam><type>zval **</type><parameter>zval_pp</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/Z_USTRVAL.xml b/internals/zendapi/macros/Z_USTRVAL.xml
index b0ee5017bf..2f0c93ec80 100644
--- a/internals/zendapi/macros/Z_USTRVAL.xml
+++ b/internals/zendapi/macros/Z_USTRVAL.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-macro.Z-USTRVAL">
  <refnamediv>
   <refname>Z_USTRVAL</refname>
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>Z_USTRVAL</methodname>
-    <methodparam><type>???</type><parameter>zval</parameter></methodparam>
+   <type>UChar *</type><methodname>Z_USTRVAL</methodname>
+    <methodparam><type>zval</type><parameter>zval</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/Z_USTRVAL_P.xml b/internals/zendapi/macros/Z_USTRVAL_P.xml
index 9aa51a23ea..b1a8d22c6c 100644
--- a/internals/zendapi/macros/Z_USTRVAL_P.xml
+++ b/internals/zendapi/macros/Z_USTRVAL_P.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-macro.Z-USTRVAL-P">
  <refnamediv>
   <refname>Z_USTRVAL_P</refname>
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>Z_USTRVAL_P</methodname>
-    <methodparam><type>???</type><parameter>zval_p</parameter></methodparam>
+   <type>UChar *</type><methodname>Z_USTRVAL_P</methodname>
+    <methodparam><type>zval *</type><parameter>zval_p</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
diff --git a/internals/zendapi/macros/Z_USTRVAL_PP.xml b/internals/zendapi/macros/Z_USTRVAL_PP.xml
index b9cc8a3dae..769c26087a 100644
--- a/internals/zendapi/macros/Z_USTRVAL_PP.xml
+++ b/internals/zendapi/macros/Z_USTRVAL_PP.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-macro.Z-USTRVAL-PP">
  <refnamediv>
   <refname>Z_USTRVAL_PP</refname>
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;		  
   <methodsynopsis>
-   <type>???</type><methodname>Z_USTRVAL_PP</methodname>
-    <methodparam><type>???</type><parameter>zval_pp</parameter></methodparam>
+   <type>UChar *</type><methodname>Z_USTRVAL_PP</methodname>
+    <methodparam><type>zval **</type><parameter>zval_pp</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...