Changeset 917


Ignore:
Timestamp:
2012-06-23T06:49:59+02:00 (3 years ago)
Author:
moo
Message:

kill sign/const warning

Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/processor/head.m4

    r878 r917  
    6363typedef zend_trait_precedence *zend_trait_precedence_ptr;
    6464#endif
    65 
    66 typedef zend_uchar xc_zval_data_type;
     65#ifdef ZEND_ENGINE_2_3
     66typedef int last_brk_cont_t;
     67#else
     68typedef zend_uint last_brk_cont_t;
     69#endif
     70
     71typedef zend_uchar xc_zval_type_t;
    6772typedef int xc_op_type;
    6873typedef zend_uchar xc_opcode;
  • trunk/processor/process.m4

    r860 r917  
    2020')
    2121dnl }}}
    22 define(`PROCESS_zval_data_type', `dnl {{{ (1:elm)
     22define(`PROCESS_xc_zval_type_t', `dnl {{{ (1:elm)
    2323    IFDPRINT(`
    2424        INDENT()
     
    2828')
    2929dnl }}}
    30 define(`PROCESS_op_type', `dnl {{{ (1:elm)
     30define(`PROCESS_xc_op_type', `dnl {{{ (1:elm)
    3131    IFDPRINT(`
    3232        INDENT()
     
    3636')
    3737dnl }}}
    38 define(`PROCESS_opcode', `dnl {{{ (1:elm)
     38define(`PROCESS_xc_opcode', `dnl {{{ (1:elm)
    3939    IFDPRINT(`
    4040        INDENT()
     
    6666    , `$1', `xc_entry_type_t',  `PROCESS_SCALAR(`$2', `d',  `$1')'
    6767    , `$1', `xc_hash_value_t',  `PROCESS_SCALAR(`$2', `lu', `$1')'
     68    , `$1', `last_brk_cont_t',  `PROCESS_SCALAR(`$2', `d', `$1')'
    6869
    6970    , `$1', `xc_ztstring',       `PROCESS_xc_ztstring(`$2')'
    70     , `$1', `xc_zval_data_type', `PROCESS_zval_data_type(`$2')'
    71     , `$1', `xc_op_type',        `PROCESS_op_type(`$2')'
    72     , `$1', `xc_opcode',         `PROCESS_opcode(`$2')'
     71    , `$1', `xc_zval_type_t',    `PROCESS_xc_zval_type_t(`$2')'
     72    , `$1', `xc_op_type',        `PROCESS_xc_op_type(`$2')'
     73    , `$1', `xc_opcode',         `PROCESS_xc_opcode(`$2')'
    7374    , `$1', `opcode_handler_t',  `/* is copying enough? */COPY(`$2')'
    7475    , `$1', `xc_md5sum_t',       `COPY(`$2')'
  • trunk/processor/processor.m4

    r880 r917  
    141141dnl }}}
    142142        DONE(value)
    143         PROCESS(xc_zval_data_type, type)
     143        PROCESS(xc_zval_type_t, type)
    144144#ifdef ZEND_ENGINE_2_3
    145145        PROCESS(zend_uchar, is_ref__gc)
     
    380380
    381381#ifdef ZEND_ENGINE_2_4
    382     STRUCT_ARRAY(default_properties_count, zval_ptr_nullable, default_properties_table)
     382    STRUCT_ARRAY(int, default_properties_count, zval_ptr_nullable, default_properties_table)
    383383    PROCESS(int, default_properties_count)
    384     STRUCT_ARRAY(default_static_members_count, zval_ptr_nullable, default_static_members_table)
     384    STRUCT_ARRAY(int, default_static_members_count, zval_ptr_nullable, default_static_members_table)
    385385    PROCESS(int, default_static_members_count)
    386386    IFCOPY(`dst->static_members_table = dst->default_static_members_table;')
     
    411411    COPYNULL(traits)
    412412    COPYZERO(num_traits)
    413     STRUCT_ARRAY(, zend_trait_alias_ptr, trait_aliases)
    414     STRUCT_ARRAY(, zend_trait_precedence_ptr, trait_precedences)
     413    STRUCT_ARRAY(, , zend_trait_alias_ptr, trait_aliases)
     414    STRUCT_ARRAY(, , zend_trait_precedence_ptr, trait_precedences)
    415415#   endif
    416416#else
     
    716716        STRUCT_P(HashTable, static_variables, HashTable_zval_ptr)
    717717#ifdef ZEND_ENGINE_2
    718         STRUCT_ARRAY(num_args, zend_arg_info, arg_info)
     718        STRUCT_ARRAY(zend_uint, num_args, zend_arg_info, arg_info)
    719719        gc_arg_info = 1;
    720720#endif
     
    793793#ifdef ZEND_ENGINE_2
    794794    PROCESS(zend_uint, fn_flags)
    795     STRUCT_ARRAY(num_args, zend_arg_info, arg_info)
     795    STRUCT_ARRAY(zend_uint, num_args, zend_arg_info, arg_info)
    796796    PROCESS(zend_uint, num_args)
    797797    PROCESS(zend_uint, required_num_args)
     
    833833#ifdef ZEND_ENGINE_2_4
    834834    dnl used when copying opcodes
    835     STRUCT_ARRAY(last_literal, zend_literal, literals)
     835    STRUCT_ARRAY(int, last_literal, zend_literal, literals)
    836836    PROCESS(int, last_literal)
    837837#endif
    838838
    839839    dnl uses literals
    840     STRUCT_ARRAY(last, zend_op, opcodes)
     840    STRUCT_ARRAY(zend_uint, last, zend_op, opcodes)
    841841    PROCESS(zend_uint, last)
    842842#ifndef ZEND_ENGINE_2_4
     
    845845
    846846#ifdef IS_CV
    847     STRUCT_ARRAY(last_var, zend_compiled_variable, vars)
     847    STRUCT_ARRAY(int, last_var, zend_compiled_variable, vars)
    848848    PROCESS(int, last_var)
    849849#   ifndef ZEND_ENGINE_2_4
     
    859859    PROCESS(zend_uint, T)
    860860
    861     STRUCT_ARRAY(last_brk_cont, zend_brk_cont_element, brk_cont_array)
    862     PROCESS(zend_uint, last_brk_cont)
     861    STRUCT_ARRAY(last_brk_cont_t, last_brk_cont, zend_brk_cont_element, brk_cont_array)
     862    PROCESS(last_brk_cont_t, last_brk_cont)
    863863#ifndef ZEND_ENGINE_2_4
    864864    PROCESS(zend_uint, current_brk_cont)
     
    869869
    870870#ifdef ZEND_ENGINE_2
    871     STRUCT_ARRAY(last_try_catch, zend_try_catch_element, try_catch_array)
     871    STRUCT_ARRAY(int, last_try_catch, zend_try_catch_element, try_catch_array)
    872872    PROCESS(int, last_try_catch)
    873873#endif
     
    997997#ifdef ZEND_ENGINE_2_4
    998998    PROCESS(zend_uint, literalinfo_cnt)
    999     STRUCT_ARRAY(literalinfo_cnt, xc_op_array_info_detail_t, literalinfos)
     999    STRUCT_ARRAY(zend_uint, literalinfo_cnt, xc_op_array_info_detail_t, literalinfos)
    10001000#else
    10011001    PROCESS(zend_uint, oplineinfo_cnt)
    1002     STRUCT_ARRAY(oplineinfo_cnt, xc_op_array_info_detail_t, oplineinfos)
     1002    STRUCT_ARRAY(zend_uint, oplineinfo_cnt, xc_op_array_info_detail_t, oplineinfos)
    10031003#endif
    10041004')
     
    10351035    PROCESS(zend_uint, methodinfo_cnt)
    10361036    IFRESTORE(`COPY(methodinfos)', `
    1037         STRUCT_ARRAY(methodinfo_cnt, xc_op_array_info_t, methodinfos)
     1037        STRUCT_ARRAY(zend_uint, methodinfo_cnt, xc_op_array_info_t, methodinfos)
    10381038    ')
    10391039    IFRESTORE(`
     
    11031103#ifdef HAVE_XCACHE_CONSTANT
    11041104    PROCESS(zend_uint, constinfo_cnt)
    1105     STRUCT_ARRAY(constinfo_cnt, xc_constinfo_t, constinfos)
     1105    STRUCT_ARRAY(zend_uint, constinfo_cnt, xc_constinfo_t, constinfos)
    11061106#endif
    11071107
    11081108    PROCESS(zend_uint, funcinfo_cnt)
    1109     STRUCT_ARRAY(funcinfo_cnt, xc_funcinfo_t, funcinfos)
     1109    STRUCT_ARRAY(zend_uint, funcinfo_cnt, xc_funcinfo_t, funcinfos)
    11101110
    11111111    PROCESS(zend_uint, classinfo_cnt)
    1112     STRUCT_ARRAY(classinfo_cnt, xc_classinfo_t, classinfos, , IFRESTORE(`processor->active_class_index'))
     1112    STRUCT_ARRAY(zend_uint, classinfo_cnt, xc_classinfo_t, classinfos, , IFRESTORE(`processor->active_class_index'))
    11131113#ifdef ZEND_ENGINE_2_1
    11141114    PROCESS(zend_uint, autoglobal_cnt)
     
    11161116        COPY(autoglobals)
    11171117    ', `
    1118         STRUCT_ARRAY(autoglobal_cnt, xc_autoglobal_t, autoglobals)
     1118        STRUCT_ARRAY(zend_uint, autoglobal_cnt, xc_autoglobal_t, autoglobals)
    11191119    ')
    11201120#endif
     
    11241124        COPY(compilererrors)
    11251125    ', `
    1126         STRUCT_ARRAY(compilererror_cnt, xc_compilererror_t, compilererrors)
     1126        STRUCT_ARRAY(zend_uint, compilererror_cnt, xc_compilererror_t, compilererrors)
    11271127    ')
    11281128#endif
  • trunk/processor/struct.m4

    r879 r917  
    172172')
    173173dnl }}}
    174 dnl {{{ STRUCT_ARRAY(1:count, 2:type, 3:elm, 4:name=type, 5:loopcounter)
     174dnl {{{ STRUCT_ARRAY(1:count_type, 2:count, 3:type, 4:elm, 5:name=type, 6:loopcounter)
    175175define(`STRUCT_ARRAY', `
    176     if (SRC(`$3')) {
     176    if (SRC(`$4')) {
    177177        ifelse(
    178             `$5', `', `int i; pushdef(`LOOPCOUNTER', `i')',
    179             `', `', `pushdef(`LOOPCOUNTER', `$5')')
    180         pushdefFUNC_NAME(`$2', `$4')
     178            `$6', `', `ifelse(`$1', `', `size_t', `$1') i; pushdef(`LOOPCOUNTER', `i')',
     179            `', `', `pushdef(`LOOPCOUNTER', `$6')')
     180        pushdefFUNC_NAME(`$3', `$5')
    181181        IFDASM(`
    182182            zval *arr;
     
    185185
    186186            for (LOOPCOUNTER = 0;
    187                     ifelse(`$1', `', `SRC(`$3[LOOPCOUNTER]')',
    188                     `', `', `LOOPCOUNTER < SRC(`$1')');
     187                    ifelse(`$2', `', `SRC(`$4[LOOPCOUNTER]')',
     188                    `', `', `LOOPCOUNTER < SRC(`$2')');
    189189                    ++LOOPCOUNTER) {
    190190                zval *zv;
     
    192192                ALLOC_INIT_ZVAL(zv);
    193193                array_init(zv);
    194                 FUNC_NAME (zv, &(SRC(`$3[LOOPCOUNTER]')) TSRMLS_CC);
     194                FUNC_NAME (zv, &(SRC(`$4[LOOPCOUNTER]')) TSRMLS_CC);
    195195                add_next_index_zval(arr, zv);
    196196            }
    197             add_assoc_zval_ex(dst, ZEND_STRS("$3"), arr);
     197            add_assoc_zval_ex(dst, ZEND_STRS("$4"), arr);
    198198        ', `
    199199            dnl find count with NULL
    200             ifelse(`$1', `', `
     200            ifelse(`$2', `', `
    201201                size_t count = 0;
    202                 while (SRC(`$3[count]')) {
     202                while (SRC(`$4[count]')) {
    203203                    ++count;
    204204                }
     
    206206                pushdef(`ARRAY_ELEMENT_COUNT', `count')
    207207            ',
    208             `', `', `pushdef(`ARRAY_ELEMENT_COUNT', `SRC(`$1')')')
    209             ALLOC(`dst->$3', `$2', `ARRAY_ELEMENT_COUNT')
     208            `', `', `pushdef(`ARRAY_ELEMENT_COUNT', `SRC(`$2')')')
     209            ALLOC(`dst->$4', `$3', `ARRAY_ELEMENT_COUNT')
    210210            popdef(`ARRAY_ELEMENT_COUNT')
    211211
    212212            for (LOOPCOUNTER = 0;
    213                     ifelse(`$1', `', `SRC(`$3[LOOPCOUNTER]')',
    214                     `', `', `LOOPCOUNTER < SRC(`$1')');
     213                    ifelse(`$2', `', `SRC(`$4[LOOPCOUNTER]')',
     214                    `', `', `LOOPCOUNTER < SRC(`$2')');
    215215                    ++LOOPCOUNTER) {
    216216                DISABLECHECK(`
    217                     STRUCT(`$2', `$3[LOOPCOUNTER]', `$4')
     217                    STRUCT(`$3', `$4[LOOPCOUNTER]', `$5')
    218218                ')
    219219            }
    220220            dnl the end marker
    221             ifelse(`$1', `', `IFCOPY(`DST(`$3[LOOPCOUNTER]') = NULL;')')
     221            ifelse(`$2', `', `IFCOPY(`DST(`$4[LOOPCOUNTER]') = NULL;')')
    222222        ')dnl IFDASM
    223         DONE(`$3')
     223        DONE(`$4')
    224224        popdef(`FUNC_NAME')
    225225        popdef(`LOOPCOUNTER')
    226226    }
    227227    else {
    228         COPYNULL(`$3')
    229     }
    230 ')
    231 dnl }}}
     228        COPYNULL(`$4')
     229    }
     230')
     231dnl }}}
  • trunk/utils.c

    r903 r917  
    176176#endif
    177177            case ZEND_JMP:
    178                 assert(Z_OP(opline->op1).jmp_addr >= op_array->opcodes && Z_OP(opline->op1).jmp_addr - op_array->opcodes < op_array->last);
     178                assert(Z_OP(opline->op1).jmp_addr >= op_array->opcodes && (zend_uint) (Z_OP(opline->op1).jmp_addr - op_array->opcodes) < op_array->last);
    179179                Z_OP(opline->op1).opline_num = Z_OP(opline->op1).jmp_addr - op_array->opcodes;
    180180                break;
     
    189189            case ZEND_JMP_SET_VAR:
    190190#endif
    191                 assert(Z_OP(opline->op2).jmp_addr >= op_array->opcodes && Z_OP(opline->op2).jmp_addr - op_array->opcodes < op_array->last);
     191                assert(Z_OP(opline->op2).jmp_addr >= op_array->opcodes && (zend_uint) (Z_OP(opline->op2).jmp_addr - op_array->opcodes) < op_array->last);
    192192                Z_OP(opline->op2).opline_num = Z_OP(opline->op2).jmp_addr - op_array->opcodes;
    193193                break;
  • trunk/xcache.c

    r916 r917  
    3838#include "utils.h"
    3939
    40 #define VAR_ENTRY_EXPIRED(pentry) ((pentry)->ttl && XG(request_time) > (pentry)->ctime + (pentry)->ttl)
     40#define VAR_ENTRY_EXPIRED(pentry) ((pentry)->ttl && XG(request_time) > (pentry)->ctime + (time_t) (pentry)->ttl)
    4141#define CHECK(x, e) do { if ((x) == NULL) { zend_error(E_ERROR, "XCache: " e); goto err; } } while (0)
    4242#define LOCK(x) xc_lock((x)->lck)
     
    464464{
    465465    TRACE("ttl %lu, %lu %lu", (zend_ulong) XG(request_time), (zend_ulong) entry->atime, xc_php_ttl);
    466     if (XG(request_time) > entry->atime + xc_php_ttl) {
     466    if (XG(request_time) > entry->atime + (time_t) xc_php_ttl) {
    467467        return 1;
    468468    }
     
    481481{
    482482    TRACE("interval %lu, %lu %lu", (zend_ulong) XG(request_time), (zend_ulong) cache->last_gc_expires, gc_interval);
    483     if (XG(request_time) - cache->last_gc_expires >= gc_interval) {
     483    if (XG(request_time) >= cache->last_gc_expires + (time_t) gc_interval) {
    484484        ENTER_LOCK(cache) {
    485             if (XG(request_time) - cache->last_gc_expires >= gc_interval) {
     485            if (XG(request_time) >= cache->last_gc_expires + (time_t) gc_interval) {
    486486                cache->last_gc_expires = XG(request_time);
    487487                xc_entry_apply_unlocked(type, cache, apply_func TSRMLS_CC);
     
    11921192    ulong           old_rsid = EG(regular_list).nNextFreeElement;
    11931193
    1194     stream = php_stream_open_wrapper(ZEND_24(NOTHING, (char *)) compiler->filename, "rb", USE_PATH | REPORT_ERRORS | ENFORCE_SAFE_MODE | STREAM_DISABLE_OPEN_BASEDIR, NULL);
     1194    stream = php_stream_open_wrapper((char *) compiler->filename, "rb", USE_PATH | REPORT_ERRORS | ENFORCE_SAFE_MODE | STREAM_DISABLE_OPEN_BASEDIR, NULL);
    11951195    if (!stream) {
    11961196        return FAILURE;
     
    12401240{
    12411241    char *class_name;
    1242     int i, class_len;
     1242    zend_uint i;
     1243    int class_len;
    12431244    xc_cest_t cest;
    12441245    xc_entry_data_php_t *php = (xc_entry_data_php_t *) data;
     
    12851286static void xc_collect_op_array_info(xc_compiler_t *compiler, xc_const_usage_t *usage, xc_op_array_info_t *op_array_info, zend_op_array *op_array TSRMLS_DC) /* {{{ */
    12861287{
    1287     int i;
     1288#ifdef ZEND_ENGINE_2_4
     1289    int literalindex;
     1290#else
     1291    zend_uint oplinenum;
     1292#endif
    12881293    xc_vector_t details;
    12891294
     
    13151320
    13161321#ifdef ZEND_ENGINE_2_4
    1317     for (i = 0; i < op_array->last_literal; i++) {
    1318         zend_literal *literal = &op_array->literals[i];
     1322    for (literalindex = 0; literalindex < op_array->last_literal; literalindex++) {
     1323        zend_literal *literal = &op_array->literals[literalindex];
    13191324        zend_uint literalinfo = 0;
    13201325        if (Z_TYPE(literal->constant) == IS_STRING) {
     
    13301335        if (literalinfo) {
    13311336            xc_op_array_info_detail_t detail;
    1332             detail.index = i;
     1337            detail.index = literalindex;
    13331338            detail.info  = literalinfo;
    13341339            xc_vector_add(xc_op_array_info_detail_t, &details, detail);
     
    13391344    op_array_info->literalinfos    = xc_vector_detach(xc_op_array_info_detail_t, &details);
    13401345#else /* ZEND_ENGINE_2_4 */
    1341     for (i = 0; i < op_array->last; i++) {
    1342         zend_op *opline = &op_array->opcodes[i];
     1346    for (oplinenum = 0; oplinenum < op_array->last; oplinenum++) {
     1347        zend_op *opline = &op_array->opcodes[oplinenum];
    13431348        zend_uint oplineinfo = 0;
    13441349        if (Z_OP_TYPE(opline->op1) == IS_CONST) {
     
    13701375        if (oplineinfo) {
    13711376            xc_op_array_info_detail_t detail;
    1372             detail.index = i;
     1377            detail.index = oplinenum;
    13731378            detail.info  = oplineinfo;
    13741379            xc_vector_add(xc_op_array_info_detail_t, &details, detail);
     
    13841389void xc_fix_op_array_info(const xc_entry_php_t *entry_php, const xc_entry_data_php_t *php, zend_op_array *op_array, int shallow_copy, const xc_op_array_info_t *op_array_info TSRMLS_DC) /* {{{ */
    13851390{
    1386     int i;
    1387 
    13881391#ifdef ZEND_ENGINE_2_4
    1389     for (i = 0; i < op_array_info->literalinfo_cnt; ++i) {
    1390         int index = op_array_info->literalinfos[i].index;
    1391         int literalinfo = op_array_info->literalinfos[i].info;
     1392    int linteralindex;
     1393
     1394    for (linteralindex = 0; linteralindex < op_array_info->literalinfo_cnt; ++linteralindex) {
     1395        int index = op_array_info->literalinfos[linteralindex].index;
     1396        int literalinfo = op_array_info->literalinfos[linteralindex].info;
    13921397        zend_literal *literal = &op_array->literals[index];
    13931398        if ((literalinfo & xcache_literal_is_file)) {
     
    14301435        }
    14311436    }
    1432 #else
    1433     for (i = 0; i < op_array_info->oplineinfo_cnt; ++i) {
    1434         int oplineno = op_array_info->oplineinfos[i].index;
    1435         int oplineinfo = op_array_info->oplineinfos[i].info;
     1437#else /* ZEND_ENGINE_2_4 */
     1438    zend_uint oplinenum;
     1439
     1440    for (oplinenum = 0; oplinenum < op_array_info->oplineinfo_cnt; ++oplinenum) {
     1441        int oplineno = op_array_info->oplineinfos[oplinenum].index;
     1442        int oplineinfo = op_array_info->oplineinfos[oplinenum].info;
    14361443        zend_op *opline = &op_array->opcodes[oplineno];
    14371444        if ((oplineinfo & xcache_op1_is_file)) {
     
    15171524        }
    15181525    }
    1519 #endif
     1526#endif /* ZEND_ENGINE_2_4 */
    15201527}
    15211528/* }}} */
     
    15351542static void xc_free_php(xc_entry_data_php_t *php TSRMLS_DC) /* {{{ */
    15361543{
    1537     int i;
     1544    zend_uint i;
    15381545    if (php->classinfos) {
    15391546        for (i = 0; i < php->classinfo_cnt; i ++) {
    15401547            xc_classinfo_t *classinfo = &php->classinfos[i];
    1541             int j;
     1548            zend_uint j;
     1549
    15421550            for (j = 0; j < classinfo->methodinfo_cnt; j ++) {
    15431551                xc_free_op_array_info(&classinfo->methodinfos[j] TSRMLS_CC);
     
    15761584{
    15771585    zend_op_array *op_array;
    1578     int old_constinfo_cnt, old_funcinfo_cnt, old_classinfo_cnt;
     1586    zend_uint old_constinfo_cnt, old_funcinfo_cnt, old_classinfo_cnt;
    15791587    zend_bool catched = 0;
    15801588
     
    16571665    /* {{{ shallow copy, pointers only */ {
    16581666        Bucket *b;
    1659         unsigned int i;
    1660         unsigned int j;
     1667        zend_uint i;
     1668        zend_uint j;
    16611669
    16621670#define COPY_H(vartype, var, cnt, name, datatype) do {        \
     
    17791787    compiler->new_php.have_early_binding = 0;
    17801788    {
    1781         int i;
     1789        zend_uint i;
    17821790        for (i = 0; i < compiler->new_php.classinfo_cnt; i ++) {
    17831791            compiler->new_php.classinfos[i].oplineno = -1;
     
    21252133{
    21262134    xc_shm_t *shm;
    2127     int i;
     2135    size_t i;
    21282136
    21292137    if (xc_php_caches) {
     
    21502158{
    21512159    xc_shm_t *shm;
    2152     int i;
     2160    size_t i;
    21532161
    21542162    if (xc_php_caches) {
     
    22492257static xc_shm_t *xc_cache_destroy(xc_cache_t **caches, xc_hash_t *hcache) /* {{{ */
    22502258{
    2251     int i;
     2259    size_t i;
    22522260    xc_cache_t *cache;
    22532261    xc_shm_t *shm;
     
    22822290    xc_mem_t *mem;
    22832291    time_t now = time(NULL);
    2284     int i;
     2292    size_t i;
    22852293    xc_memsize_t memsize;
    22862294
     
    24052413static void xc_request_init(TSRMLS_D) /* {{{ */
    24062414{
    2407     int i;
     2415    size_t i;
    24082416
    24092417    if (!XG(internal_table_copied)) {
     
    24992507#endif
    25002508{
    2501     int i;
     2509    size_t i;
    25022510
    25032511    if (xcache_globals->php_holds != NULL) {
     
    37153723static int xc_config_hash(xc_hash_t *p, char *name, char *default_value) /* {{{ */
    37163724{
    3717     int bits, size;
     3725    size_t bits, size;
    37183726    char *value;
    37193727
  • trunk/xcache.h

    r898 r917  
    227227typedef ulong xc_hash_value_t;
    228228typedef struct {
    229     int bits;
    230     int size;
    231     int mask;
     229    size_t bits;
     230    size_t size;
     231    xc_hash_value_t mask;
    232232} xc_hash_t;
    233233
     
    420420    time_t     dtime;           /*  deletion time of this entry */
    421421    zend_ulong hits;
    422     long      ttl;
     422    zend_ulong ttl;
    423423
    424424    xc_entry_name_t name;
Note: See TracChangeset for help on using the changeset viewer.