Changeset 1354 in svn


Ignore:
Timestamp:
2013-08-26T16:45:40Z (2 years ago)
Author:
Xuefer
Message:

merge from trunk, fixed #322: kill 64bit warnings

Location:
branches/3.0
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/3.0

    • Property svn:mergeinfo changed
      /trunkmerged: 1211
  • branches/3.0/processor/head.m4

    r1201 r1354  
    101101    xc_allocator_t            *allocator;
    102102    const zend_class_entry *cache_ce;
    103     zend_uint cache_class_index;
     103    zend_ulong cache_class_index;
    104104
    105105    const zend_op_array    *active_op_array_src;
     
    239239 * return class_index + 1
    240240 */
    241 static zend_uint xc_get_class_num(xc_processor_t *processor, zend_class_entry *ce) {
     241static zend_ulong xc_get_class_num(xc_processor_t *processor, zend_class_entry *ce) {
    242242    zend_uint i;
    243243    const xc_entry_data_php_t *php = processor->php_src;
Note: See TracChangeset for help on using the changeset viewer.