diff options
| author | Anatoliy Belsky <ab@php.net> | 2012-07-12 10:57:26 +0200 |
|---|---|---|
| committer | Anatoliy Belsky <ab@php.net> | 2012-07-12 10:57:26 +0200 |
| commit | 86428169d3c8d7d9a3dfd4e27fb48cf1314102dc (patch) | |
| tree | 77b25a5d9cb649592d298922963556f529d6e7ee /ext/spl/spl_iterators.h | |
| parent | be8f089a13ef5e023ec27f14de8bc2453c75bb54 (diff) | |
| parent | ad7eeba3c1a4c77f439afc936fbf50b811a46a6b (diff) | |
| download | php-git-86428169d3c8d7d9a3dfd4e27fb48cf1314102dc.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
reverted changes for #62477
Diffstat (limited to 'ext/spl/spl_iterators.h')
| -rwxr-xr-x | ext/spl/spl_iterators.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/spl/spl_iterators.h b/ext/spl/spl_iterators.h index 6be00798e5..4a2c999c30 100755 --- a/ext/spl/spl_iterators.h +++ b/ext/spl/spl_iterators.h @@ -137,7 +137,7 @@ typedef struct _spl_dual_it_object { uint str_key_len; ulong int_key; int key_type; /* HASH_KEY_IS_STRING or HASH_KEY_IS_LONG */ - long pos; + int pos; } current; dual_it_type dit_type; union { |