gitignore

[m6w6/ext-psi] / src / cpp_tokiter.c

diff --git a/src/cpp_tokiter.c b/src/cpp_tokiter.c
index c2bcb95f9c973d9566f6b0af88b159a173cb27ec..a28fcf9249336753a9a621829b85284fda012178 100644 (file)
--- a/src/cpp_tokiter.c
+++ b/src/cpp_tokiter.c
@@ -23,12 +23,17 @@
  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 "parser.h"
 
-void psi_cpp_tokiter_dump(int fd, struct psi_cpp *cpp)
+void psi_cpp_tokiter_dump(struct psi_dump *dump, struct psi_cpp *cpp);
+void psi_cpp_tokiter_dump(struct psi_dump *dump, struct psi_cpp *cpp)
 {
        size_t i = cpp->index;
        struct psi_token *T;
@@ -39,14 +44,14 @@ void psi_cpp_tokiter_dump(int fd, struct psi_cpp *cpp)
                i = 0;
        }
        while (psi_plist_get(cpp->tokens.iter, i, &T)) {
-               dprintf(fd, "PSI: CPP tokens %5zu %c ", i, cpp->index == i ? '*' : ' ');
+               PSI_DUMP(dump, "PSI: CPP tokens %5zu %c ", i, cpp->index == i ? '*' : ' ');
                if (T) {
-                       psi_token_dump(fd, T);
+                       psi_token_dump(dump, T);
                } else {
-                       dprintf(fd, "TOKEN deleted\n");
+                       PSI_DUMP(dump, "TOKEN deleted\n");
                }
                if (i >= cpp->index + 40) {
-                       dprintf(fd, "PSI: CPP tokens .....\n");
+                       PSI_DUMP(dump, "PSI: CPP tokens .....\n");
                        break;
                }
                ++i;