Add skeleton for character property file. Also remove some HAVE_UNICODE

tests since it's non optional.

diff --git a/ext/unicode/config.m4 b/ext/unicode/config.m4
index 5f102a50d4c0ef9dc7396da79200aaf71a5e06b6..19dd5cb6b15c44f3ce9267aee3aa93bbb8dd301d 100644 (file)
--- a/ext/unicode/config.m4
+++ b/ext/unicode/config.m4
@@ -4,4 +4,4 @@ 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)

diff --git a/ext/unicode/locale.c b/ext/unicode/locale.c
index fbf81940f61cc57b7a6e4f293581208214e30356..c91e8c5fdcf4758a208db0f34eb36546cde5e062 100644 (file)
--- a/ext/unicode/locale.c
+++ b/ext/unicode/locale.c
@@ -17,8 +17,6 @@
 /* $Id$ */ 
 
 #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 @@ PHP_FUNCTION(locale_set_default)
 }
 /* }}} */
 
-#endif /* HAVE_UNICODE */
-
 
 /*
  * Local variables:

diff --git a/ext/unicode/php_unicode.h b/ext/unicode/php_unicode.h
index f8dc9ae202beb0b2ae9184691e8746af4c515482..3ca20455292c72470b273aa916d5e81115fdfe48 100644 (file)
--- a/ext/unicode/php_unicode.h
+++ b/ext/unicode/php_unicode.h
@@ -29,8 +29,6 @@ extern "C" {
 
 #include <php.h>
 
-#ifdef HAVE_UNICODE
-
 #include <php_ini.h>
 #include <SAPI.h>
 #include <ext/standard/info.h>
@@ -75,8 +73,6 @@ void php_init_collation(TSRMLS_D);
 #endif
 
 #include <zend_unicode.h>
-#include <unicode/uloc.h>
-#endif /* PHP_HAVE_UNICODE */
 
 #endif /* PHP_UNICODE_H */
 

diff --git a/ext/unicode/property.c b/ext/unicode/property.c
new file mode 100644 (file)
index 0000000..e7f411a
--- /dev/null
+++ b/ext/unicode/property.c
@@ -0,0 +1,31 @@
+/*
+   +----------------------------------------------------------------------+
+   | 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          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Authors: Andrei Zmievski <andrei@php.net>                            |
+   +----------------------------------------------------------------------+
+ */
+
+/* $Id$ */ 
+
+#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
+ */