build administrativa

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

diff --git a/src/types/cpp_macro_call.c b/src/types/cpp_macro_call.c
index fb32bc0dccd5e4c611ada58b9a9293b596f1d439..2764200715628e0d3b8c8e5dedaa3ff0aedcd132 100644 (file)
--- a/src/types/cpp_macro_call.c
+++ b/src/types/cpp_macro_call.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"
@@ -47,7 +51,7 @@ struct psi_cpp_macro_call *psi_cpp_macro_call_copy(
        }
        if (call->args) {
                copy->args = psi_plist_copy(call->args,
-                               (void (*)(void*)) psi_token_copy_ctor);
+                               (void (*)(void*)) psi_num_exp_copy_ctor);
        }
        return copy;
 }
@@ -68,17 +72,17 @@ void psi_cpp_macro_call_free(struct psi_cpp_macro_call **call_ptr)
        }
 }
 
-void psi_cpp_macro_call_dump(int fd, struct psi_cpp_macro_call *call)
+void psi_cpp_macro_call_dump(struct psi_dump *dump, struct psi_cpp_macro_call *call)
 {
        size_t i = 0;
        struct psi_num_exp *num;
 
-       dprintf(fd, "%s(", call->name->val);
+       PSI_DUMP(dump, "%s(", call->name->val);
        while (psi_plist_get(call->args, i++, &num)) {
                if (i > 1) {
-                       dprintf(fd, ", ");
+                       PSI_DUMP(dump, ", ");
                }
-               psi_num_exp_dump(fd, num);
+               psi_num_exp_dump(dump, num);
        }
-       dprintf(fd, ")");
+       PSI_DUMP(dump, ")");
 }