From: Moriyoshi Koizumi Date: Mon, 19 Jul 2004 05:04:33 +0000 (+0000) Subject: - Rename php_compat.h to php_onig_compat.h to avoid name conflict. X-Git-Tag: PRE_ZEND_VM_DISPATCH_PATCH~463 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=83d2cbd36e6ae101e7797f6286c729689d8f0f7c;p=php - 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 b4f5a84e6f..99f6bdab0d 100644 --- 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