diff options
| author | Moriyoshi Koizumi <moriyoshi@php.net> | 2004-07-19 05:04:33 +0000 |
|---|---|---|
| committer | Moriyoshi Koizumi <moriyoshi@php.net> | 2004-07-19 05:04:33 +0000 |
| commit | 83d2cbd36e6ae101e7797f6286c729689d8f0f7c (patch) | |
| tree | 29781a5e30b9f0b6b10c416114c2516f53335dc9 | |
| parent | fa958958c30753e76b7cb378dc3266ad0997c92b (diff) | |
| download | php-git-83d2cbd36e6ae101e7797f6286c729689d8f0f7c.tar.gz | |
- Rename php_compat.h to php_onig_compat.h to avoid name conflict.
(reported by Joe Orton, thanks.)
| -rw-r--r-- | ext/mbstring/oniguruma/oniguruma.h | 2 | ||||
| -rw-r--r-- | ext/mbstring/oniguruma/php_onig_compat.h (renamed from ext/mbstring/oniguruma/php_compat.h) | 0 |
2 files changed, 1 insertions, 1 deletions
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 index d7f1ad56f1..d7f1ad56f1 100644 --- a/ext/mbstring/oniguruma/php_compat.h +++ b/ext/mbstring/oniguruma/php_onig_compat.h |