moriyoshi               Mon Jul 19 01:06:02 2004 EDT

  Added files:                 (Branch: PHP_5_0)
    /php-src/ext/mbstring/oniguruma     php_onig_compat.h 

  Removed files:               
    /php-src/ext/mbstring/oniguruma     php_compat.h 

  Modified files:              
    /php-src/ext/mbstring/oniguruma     oniguruma.h 
  Log:
  - MFH: rename php_compat.h to php_onig_compat.h to avoid name conflict.
    (reported by Joe Orton, thanks.)
  
  
http://cvs.php.net/diff.php/php-src/ext/mbstring/oniguruma/oniguruma.h?r1=1.3&r2=1.3.2.1&ty=u
Index: php-src/ext/mbstring/oniguruma/oniguruma.h
diff -u php-src/ext/mbstring/oniguruma/oniguruma.h:1.3 
php-src/ext/mbstring/oniguruma/oniguruma.h:1.3.2.1
--- php-src/ext/mbstring/oniguruma/oniguruma.h:1.3      Thu Mar  4 16:50:20 2004
+++ php-src/ext/mbstring/oniguruma/oniguruma.h  Mon Jul 19 01:06:01 2004
@@ -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

http://cvs.php.net/co.php/php-src/ext/mbstring/oniguruma/php_onig_compat.h?r=1.1&p=1
Index: php-src/ext/mbstring/oniguruma/php_onig_compat.h
+++ php-src/ext/mbstring/oniguruma/php_onig_compat.h
#ifndef _PHP_MBREGEX_COMPAT_H
#define _PHP_MBREGEX_COMPAT_H

#define re_pattern_buffer           php_mb_re_pattern_buffer
#define regex_t                     php_mb_regex_t

#endif /* _PHP_MBREGEX_COMPAT_H */

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to