X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fcpp.c;h=eaf43f800dce273f81c9724e73bb8236777d9d23;hp=d703bda8329c30be6407afd3d81a50dd980d386b;hb=f077a911ab3d74c43a6316d745e885446820e7bf;hpb=f76cbab7698c988217d56a96f3ef68005cddd5ec

diff --git a/src/cpp.c b/src/cpp.c
index d703bda..eaf43f8 100644
--- 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;