diff options
| author | Andrey Hristov <andrey@php.net> | 2010-08-12 12:02:02 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2010-08-12 12:02:02 +0000 |
| commit | 92ef63a07b04bb85d6587b2905d068ce8a781061 (patch) | |
| tree | 4ce90d8821ccc1673b4d42539285049f93c46bc3 /ext/mysqlnd/mysqlnd_result_meta.c | |
| parent | 8bf7114691540f29e6a07a34231fdf536652c1b8 (diff) | |
| download | php-git-92ef63a07b04bb85d6587b2905d068ce8a781061.tar.gz | |
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.
Diffstat (limited to 'ext/mysqlnd/mysqlnd_result_meta.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_result_meta.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/mysqlnd/mysqlnd_result_meta.c b/ext/mysqlnd/mysqlnd_result_meta.c index 73c0d9c7fd..8828c0bba6 100644 --- a/ext/mysqlnd/mysqlnd_result_meta.c +++ b/ext/mysqlnd/mysqlnd_result_meta.c @@ -92,7 +92,7 @@ mysqlnd_is_key_numeric(char *key, size_t length, long *idx) /* }}} */ -#if PHP_MAJOR_VERSION >= 6 +#if MYSQLND_UNICODE /* {{{ mysqlnd_unicode_is_key_numeric */ static zend_bool mysqlnd_unicode_is_key_numeric(UChar *key, size_t length, long *idx) @@ -142,7 +142,7 @@ MYSQLND_METHOD(mysqlnd_res_meta, read_metadata)(MYSQLND_RES_METADATA * const met { unsigned int i = 0; MYSQLND_PACKET_RES_FIELD * field_packet; -#if PHP_MAJOR_VERSION >= 6 +#if MYSQLND_UNICODE UChar *ustr; int ulen; #endif @@ -227,7 +227,7 @@ MYSQLND_METHOD(mysqlnd_res_meta, read_metadata)(MYSQLND_RES_METADATA * const met } -#if PHP_MAJOR_VERSION >= 6 +#if MYSQLND_UNICODE zend_string_to_unicode(UG(utf8_conv), &ustr, &ulen, meta->fields[i].name, meta->fields[i].name_length TSRMLS_CC); @@ -284,7 +284,7 @@ MYSQLND_METHOD(mysqlnd_res_meta, free)(MYSQLND_RES_METADATA * meta TSRMLS_DC) if (meta->zend_hash_keys) { DBG_INF("Freeing zend_hash_keys"); -#if PHP_MAJOR_VERSION >= 6 +#if MYSQLND_UNICODE if (UG(unicode)) { for (i = 0; i < meta->field_count; i++) { if (meta->zend_hash_keys[i].ustr.v) { @@ -380,7 +380,7 @@ MYSQLND_METHOD(mysqlnd_res_meta, clone_metadata)(const MYSQLND_RES_METADATA * co /* copy the trailing \0 too */ memcpy(new_fields[i].def, orig_fields[i].def, orig_fields[i].def_length + 1); } -#if PHP_MAJOR_VERSION >= 6 +#if MYSQLND_UNICODE if (new_meta->zend_hash_keys[i].ustr.u) { new_meta->zend_hash_keys[i].ustr.u = eustrndup(new_meta->zend_hash_keys[i].ustr.u, new_meta->zend_hash_keys[i].ulen); |