gitignore

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

diff --git a/src/cpp.c b/src/cpp.c
index 9daca1bf84b49c9ec14fe67ee11cab4a38bb5729..eaf43f800dce273f81c9724e73bb8236777d9d23 100644 (file)
--- a/src/cpp.c
+++ b/src/cpp.c
@@ -23,21 +23,27 @@
  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 "php_psi.h"
 
 #include <libgen.h>
 
 #include "cpp.h"
 #include "parser.h"
+#include "debug.h"
 
 #define PSI_CPP_SEARCH
 #define PSI_CPP_PREDEF
-#include "php_psi_cpp.h"
-
-#include "php_psi.h"
+#include "php_psi_predef.h"
 
 HashTable psi_cpp_defaults;
 
+PHP_MINIT_FUNCTION(psi_cpp);
 PHP_MINIT_FUNCTION(psi_cpp)
 {
        struct psi_parser parser;
@@ -70,6 +76,7 @@ PHP_MINIT_FUNCTION(psi_cpp)
        return SUCCESS;
 }
 
+PHP_MSHUTDOWN_FUNCTION(psi_cpp);
 PHP_MSHUTDOWN_FUNCTION(psi_cpp)
 {
        struct psi_cpp_macro_decl *macro;
@@ -202,7 +209,7 @@ static bool psi_cpp_stage1(struct psi_cpp *cpp)
 
                                        no_ws->type = PSI_T_NO_WHITESPACE;
                                        zend_string_release(no_ws->text);
-                                       no_ws->text = zend_string_init_interned("\xA0", 1, 1);
+                                       no_ws->text = psi_string_init_interned("\xA0", 1, 1);
                                        psi_cpp_tokiter_add(cpp, no_ws);
                                        continue;
                                }