update readme

[m6w6/ext-psi] / src / types / cpp_macro_decl.c

diff --git a/src/types/cpp_macro_decl.c b/src/types/cpp_macro_decl.c
index c26b70896564fac4160ae777afb9b42d233adf93..40e6c97efb7afb73389d325a5c318fdef26d7eb5 100644 (file)
--- a/src/types/cpp_macro_decl.c
+++ b/src/types/cpp_macro_decl.c
@@ -23,7 +23,11 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *******************************************************************************/
 
-#include "php_psi_stdinc.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#else
+# include "php_config.h"
+#endif
 
 #include "cpp.h"
 #include "data.h"
@@ -31,7 +35,7 @@
 struct psi_cpp_macro_decl *psi_cpp_macro_decl_init(struct psi_plist *sig,
                struct psi_plist *tokens, struct psi_num_exp *exp)
 {
-       struct psi_cpp_macro_decl *macro = calloc(1, sizeof(*macro));
+       struct psi_cpp_macro_decl *macro = pecalloc(1, sizeof(*macro), 1);
        macro->exp = exp;
        macro->sig = sig;
        macro->tokens = tokens;
@@ -58,24 +62,24 @@ void psi_cpp_macro_decl_free(struct psi_cpp_macro_decl **macro_ptr)
        }
 }
 
-void psi_cpp_macro_decl_dump(int fd, struct psi_cpp_macro_decl *macro)
+void psi_cpp_macro_decl_dump(struct psi_dump *dump, struct psi_cpp_macro_decl *macro)
 {
-       dprintf(fd, "%s", macro->token->text->val);
+       PSI_DUMP(dump, "%s", macro->token->text->val);
 
        if (macro->sig) {
                size_t i = 0;
                struct psi_token *tok;
 
-               dprintf(fd, "(");
+               PSI_DUMP(dump, "(");
                while (psi_plist_get(macro->sig, i++, &tok)) {
-                       dprintf(fd, "%s%s", i>1?",":"", tok->text->val);
+                       PSI_DUMP(dump, "%s%s", i>1?",":"", tok->text->val);
                }
-               dprintf(fd, ")");
+               PSI_DUMP(dump, ")");
        }
 
        if (macro->exp) {
-               dprintf(fd, " ");
-               psi_num_exp_dump(fd, macro->exp);
+               PSI_DUMP(dump, " ");
+               psi_num_exp_dump(dump, macro->exp);
 
                assert(macro->tokens);
 
@@ -86,13 +90,13 @@ void psi_cpp_macro_decl_dump(int fd, struct psi_cpp_macro_decl *macro)
                while (psi_plist_get(macro->tokens, i++, &tok)) {
                        switch (tok->type) {
                        case PSI_T_QUOTED_STRING:
-                               dprintf(fd, " \"%s\"", tok->text->val);
+                               PSI_DUMP(dump, " \"%s\"", tok->text->val);
                                break;
                        case PSI_T_QUOTED_CHAR:
-                               dprintf(fd, " '%s'", tok->text->val);
+                               PSI_DUMP(dump, " '%s'", tok->text->val);
                                break;
                        default:
-                               dprintf(fd, " %s", tok->text->val);
+                               PSI_DUMP(dump, " %s", tok->text->val);
                        }
                }
        }