From c974313aed296dfab6cd7e1859ecf48a5fd581a8 Mon Sep 17 00:00:00 2001 From: Andrey Hristov Date: Thu, 12 Aug 2010 12:02:02 +0000 Subject: Switch from using PHP_MAJOR_VERSION to separate define for unicode. Unicode is no more, but these are "bookmarks" where to change mysqlnd, if Unicode becomes trendy again. --- ext/mysqlnd/mysqlnd_statistics.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ext/mysqlnd/mysqlnd_statistics.c') diff --git a/ext/mysqlnd/mysqlnd_statistics.c b/ext/mysqlnd/mysqlnd_statistics.c index 98d05aa01d..f0c82cc19d 100644 --- a/ext/mysqlnd/mysqlnd_statistics.c +++ b/ext/mysqlnd/mysqlnd_statistics.c @@ -203,14 +203,14 @@ mysqlnd_fill_stats_hash(const MYSQLND_STATS * const stats, const MYSQLND_STRING mysqlnd_array_init(return_value, stats->count); for (i = 0; i < stats->count; i++) { -#if PHP_MAJOR_VERSION >= 6 +#if MYSQLND_UNICODE UChar *ustr, *tstr; int ulen, tlen; #endif char tmp[25]; sprintf((char *)&tmp, MYSQLND_LLU_SPEC, stats->values[i]); -#if PHP_MAJOR_VERSION >= 6 +#if MYSQLND_UNICODE zend_string_to_unicode(UG(utf8_conv), &ustr, &ulen, names[i].s, names[i].l + 1 TSRMLS_CC); zend_string_to_unicode(UG(utf8_conv), &tstr, &tlen, tmp, strlen(tmp) + 1 TSRMLS_CC); add_u_assoc_unicode_ex(return_value, IS_UNICODE, ZSTR(ustr), ulen, tstr, 1); -- cgit v1.2.1