#pragma lib

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

diff --git a/src/data.c b/src/data.c
index 57b6f4d0c0b936ad7b2b48eed3e860d5582d10c0..36481b500a1589ff734dc8e2737053184a33ccf5 100644 (file)
--- a/src/data.c
+++ b/src/data.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 "php_psi.h"
 #include "data.h"
 
@@ -36,7 +40,7 @@
 #if PSI_THREADED_PARSER
 # include <pthread.h>
 
-pthread_mutex_t psi_string_mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_mutex_t psi_string_mutex = PTHREAD_MUTEX_INITIALIZER;
 
 zend_string *psi_string_init_interned(const char *buf, size_t len, int p)
 {
@@ -211,13 +215,13 @@ void psi_data_dtor(struct psi_data *data)
 void psi_data_dump(struct psi_dump *dump, struct psi_data *D)
 {
        size_t i = 0;
-       char *libname;
+       zend_string *libname;
 
        if (D->file.filename) {
                PSI_DUMP(dump, "// filename=%s (%u errors)\n", D->file.filename->val, D->errors);
        }
        while (psi_plist_get(D->file.libnames, i++, &libname)) {
-               PSI_DUMP(dump, "lib \"%s\";\n", libname);
+               PSI_DUMP(dump, "#pragma lib \"%s\"\n", libname->val);
        }
        if (psi_plist_count(D->types)) {
                size_t i = 0;