andrei Tue May 2 20:58:30 2006 UTC Added files: /php-src/ext/unicode property.c
Modified files: /php-src/ext/unicode config.m4 locale.c php_unicode.h Log: Add skeleton for character property file. Also remove some HAVE_UNICODE tests since it's non optional. http://cvs.php.net/viewcvs.cgi/php-src/ext/unicode/config.m4?r1=1.7&r2=1.8&diff_format=u Index: php-src/ext/unicode/config.m4 diff -u php-src/ext/unicode/config.m4:1.7 php-src/ext/unicode/config.m4:1.8 --- php-src/ext/unicode/config.m4:1.7 Wed Mar 29 01:20:43 2006 +++ php-src/ext/unicode/config.m4 Tue May 2 20:58:30 2006 @@ -1,7 +1,7 @@ dnl -dnl $Id: config.m4,v 1.7 2006/03/29 01:20:43 pollita Exp $ +dnl $Id: config.m4,v 1.8 2006/05/02 20:58:30 andrei Exp $ dnl PHP_SUBST(UNICODE_SHARED_LIBADD) AC_DEFINE(HAVE_UNICODE, 1, [ ]) -PHP_NEW_EXTENSION(unicode, unicode.c locale.c unicode_iterators.c collator.c, $ext_shared) +PHP_NEW_EXTENSION(unicode, unicode.c locale.c unicode_iterators.c collator.c property.c, $ext_shared) http://cvs.php.net/viewcvs.cgi/php-src/ext/unicode/locale.c?r1=1.9&r2=1.10&diff_format=u Index: php-src/ext/unicode/locale.c diff -u php-src/ext/unicode/locale.c:1.9 php-src/ext/unicode/locale.c:1.10 --- php-src/ext/unicode/locale.c:1.9 Fri Apr 21 19:35:26 2006 +++ php-src/ext/unicode/locale.c Tue May 2 20:58:30 2006 @@ -14,11 +14,9 @@ +----------------------------------------------------------------------+ */ -/* $Id: locale.c,v 1.9 2006/04/21 19:35:26 andrei Exp $ */ +/* $Id: locale.c,v 1.10 2006/05/02 20:58:30 andrei Exp $ */ #include "php_unicode.h" - -#if HAVE_UNICODE #include "unicode/ubrk.h" static void php_canonicalize_locale_id(char **target, int32_t *target_len, char *locale, UErrorCode *status) @@ -87,8 +85,6 @@ } /* }}} */ -#endif /* HAVE_UNICODE */ - /* * Local variables: http://cvs.php.net/viewcvs.cgi/php-src/ext/unicode/php_unicode.h?r1=1.11&r2=1.12&diff_format=u Index: php-src/ext/unicode/php_unicode.h diff -u php-src/ext/unicode/php_unicode.h:1.11 php-src/ext/unicode/php_unicode.h:1.12 --- php-src/ext/unicode/php_unicode.h:1.11 Fri Apr 21 21:10:01 2006 +++ php-src/ext/unicode/php_unicode.h Tue May 2 20:58:30 2006 @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_unicode.h,v 1.11 2006/04/21 21:10:01 andrei Exp $ */ +/* $Id: php_unicode.h,v 1.12 2006/05/02 20:58:30 andrei Exp $ */ #ifndef PHP_UNICODE_H #define PHP_UNICODE_H @@ -29,8 +29,6 @@ #include <php.h> -#ifdef HAVE_UNICODE - #include <php_ini.h> #include <SAPI.h> #include <ext/standard/info.h> @@ -75,8 +73,6 @@ #endif #include <zend_unicode.h> -#include <unicode/uloc.h> -#endif /* PHP_HAVE_UNICODE */ #endif /* PHP_UNICODE_H */ http://cvs.php.net/viewcvs.cgi/php-src/ext/unicode/property.c?view=markup&rev=1.1 Index: php-src/ext/unicode/property.c +++ php-src/ext/unicode/property.c /* +----------------------------------------------------------------------+ | PHP Version 6 | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | | available through the world-wide-web at the following url: | | http://www.php.net/license/3_01.txt | | If you did not receive a copy of the PHP license and are unable to | | obtain it through the world-wide-web, please send a note to | | [EMAIL PROTECTED] so we can mail you a copy immediately. | +----------------------------------------------------------------------+ | Authors: Andrei Zmievski <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ */ /* $Id: property.c,v 1.1 2006/05/02 20:58:30 andrei Exp $ */ #include "php_unicode.h" /* * Local variables: * tab-width: 4 * c-basic-offset: 4 * End: * vim600: noet sw=4 ts=4 fdm=marker * vim<600: noet sw=4 ts=4 */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php