- Rename php_compat.h to php_onig_compat.h to avoid name conflict.

  (reported by Joe Orton, thanks.)

diff --git a/ext/mbstring/oniguruma/oniguruma.h b/ext/mbstring/oniguruma/oniguruma.h
index b4f5a84e6f268869e77be55b50ab2d8302e63c98..99f6bdab0d2531a820cf42ff1181a1d801be69c6 100644 (file)
--- a/ext/mbstring/oniguruma/oniguruma.h
+++ b/ext/mbstring/oniguruma/oniguruma.h
@@ -8,7 +8,7 @@
 #ifndef ONIGURUMA_H
 #define ONIGURUMA_H
 
-#include "php_compat.h"
+#include "php_onig_compat.h"
 
 #define ONIGURUMA
 #define ONIGURUMA_VERSION_MAJOR   2

diff --git a/ext/mbstring/oniguruma/php_compat.h b/ext/mbstring/oniguruma/php_onig_compat.h
similarity index 100%
rename from ext/mbstring/oniguruma/php_compat.h
rename to ext/mbstring/oniguruma/php_onig_compat.h