build administrativa

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

diff --git a/src/cpp.c b/src/cpp.c
index 9daca1bf84b49c9ec14fe67ee11cab4a38bb5729..6b7bb53e75f9f5ba88752087c753258ed9a26f23 100644 (file)
--- a/src/cpp.c
+++ b/src/cpp.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 <libgen.h>
 
@@ -32,12 +36,13 @@
 
 #define PSI_CPP_SEARCH
 #define PSI_CPP_PREDEF
-#include "php_psi_cpp.h"
+#include "php_psi_predef.h"
 
 #include "php_psi.h"
 
 HashTable psi_cpp_defaults;
 
+PHP_MINIT_FUNCTION(psi_cpp);
 PHP_MINIT_FUNCTION(psi_cpp)
 {
        struct psi_parser parser;
@@ -70,6 +75,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 +208,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;
                                }