diff options
Diffstat (limited to 'ext/intl')
-rwxr-xr-x | ext/intl/config.w32 | 2 | ||||
-rw-r--r-- | ext/intl/idn/idn.c | 2 | ||||
-rwxr-xr-x | ext/intl/locale/locale_methods.c | 2 | ||||
-rwxr-xr-x | ext/intl/php_intl.h | 2 | ||||
-rw-r--r-- | ext/intl/resourcebundle/resourcebundle.c | 2 | ||||
-rw-r--r-- | ext/intl/resourcebundle/resourcebundle_class.c | 7 |
6 files changed, 9 insertions, 8 deletions
diff --git a/ext/intl/config.w32 b/ext/intl/config.w32 index 6635b8903..779b9fc4c 100755 --- a/ext/intl/config.w32 +++ b/ext/intl/config.w32 @@ -1,4 +1,4 @@ -// $Id: config.w32 294108 2010-01-27 17:29:38Z johannes $ +// $Id: config.w32 293114 2010-01-04 21:44:45Z stas $ // vim:ft=javascript ARG_ENABLE("intl", "Enable internationalization support", "no"); diff --git a/ext/intl/idn/idn.c b/ext/intl/idn/idn.c index 158b76e85..728172a8b 100644 --- a/ext/intl/idn/idn.c +++ b/ext/intl/idn/idn.c @@ -15,7 +15,7 @@ | Author: Pierre A. Joye <pierre@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: idn.c 293979 2010-01-25 13:59:35Z johannes $ */ +/* $Id: idn.c 292566 2009-12-23 21:41:05Z stas $ */ /* {{{ includes */ #ifdef HAVE_CONFIG_H diff --git a/ext/intl/locale/locale_methods.c b/ext/intl/locale/locale_methods.c index 438e905f9..51c02923e 100755 --- a/ext/intl/locale/locale_methods.c +++ b/ext/intl/locale/locale_methods.c @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: locale_methods.c 293979 2010-01-25 13:59:35Z johannes $ */ +/* $Id: locale_methods.c 292566 2009-12-23 21:41:05Z stas $ */ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/ext/intl/php_intl.h b/ext/intl/php_intl.h index 3ae530a0a..4ede069e2 100755 --- a/ext/intl/php_intl.h +++ b/ext/intl/php_intl.h @@ -63,7 +63,7 @@ PHP_RINIT_FUNCTION(intl); PHP_RSHUTDOWN_FUNCTION(intl); PHP_MINFO_FUNCTION(intl); -#define PHP_INTL_VERSION "1.0.3" +#define PHP_INTL_VERSION "1.1.0" #endif /* PHP_INTL_H */ diff --git a/ext/intl/resourcebundle/resourcebundle.c b/ext/intl/resourcebundle/resourcebundle.c index 3d881a229..b525ed1a3 100644 --- a/ext/intl/resourcebundle/resourcebundle.c +++ b/ext/intl/resourcebundle/resourcebundle.c @@ -1,4 +1,4 @@ -/* + /* +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ diff --git a/ext/intl/resourcebundle/resourcebundle_class.c b/ext/intl/resourcebundle/resourcebundle_class.c index 1c9a689b2..bebd0e828 100644 --- a/ext/intl/resourcebundle/resourcebundle_class.c +++ b/ext/intl/resourcebundle/resourcebundle_class.c @@ -126,7 +126,7 @@ ZEND_BEGIN_ARG_INFO_EX( arginfo_resourcebundle___construct, 0, 0, 2 ) ZEND_END_ARG_INFO() /* }}} */ -/* {{{ proto void ResourceBundle::__construct( string $bundlename [, string $locale [, bool $fallback = true ]] ) +/* {{{ proto void ResourceBundle::__construct( string $locale [, string $bundlename [, bool $fallback = true ]] ) * ResourceBundle object constructor */ PHP_METHOD( ResourceBundle, __construct ) @@ -136,8 +136,9 @@ PHP_METHOD( ResourceBundle, __construct ) } /* }}} */ -/* {{{ proto ResourceBundle ResourceBundle::create( string $bundlename [, string $locale [, bool $fallback = true ]] ) -proto ResourceBundle resourcebundle_create( string $bundlename [, string $locale [, bool $fallback = true ]] ) */ +/* {{{ proto ResourceBundle ResourceBundle::create( string $locale [, string $bundlename [, bool $fallback = true ]] ) +proto ResourceBundle resourcebundle_create( string $locale [, string $bundlename [, bool $fallback = true ]] ) +*/ PHP_FUNCTION( resourcebundle_create ) { object_init_ex( return_value, ResourceBundle_ce_ptr ); |