Changeset 860 for trunk/xcache.h


Ignore:
Timestamp:
2012-03-29T04:54:33+02:00 (3 years ago)
Author:
moo
Message:

kill warnings

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/xcache.h

    r859 r860  
    4343#endif 
    4444#ifdef ZEND_ENGINE_2_4 
    45 #   define ZEND_24(x) x 
    46 #else 
    47 #   define ZEND_24(x) 
     45#   define ZEND_24(pre24, v24) v24 
     46#else 
     47#   define ZEND_24(pre24, v24) pre24 
    4848#endif 
    4949 
     
    191191#ifndef IS_UNICODE 
    192192#   define zend_u_hash_add(ht, type, arKey, nKeyLength, pData, nDataSize, pDest) \ 
    193        zend_hash_add(ht, arKey, nKeyLength, pData, nDataSize, pDest) 
     193       zend_hash_add(ht, ZEND_24((char *), NOTHING) arKey, nKeyLength, pData, nDataSize, pDest) 
    194194 
    195195#   define zend_u_hash_quick_add(ht, type, arKey, nKeyLength, h, pData, nDataSize, pDest) \ 
    196        zend_hash_quick_add(ht, arKey, nKeyLength, h, pData, nDataSize, pDest) 
     196       zend_hash_quick_add(ht, ZEND_24((char *), NOTHING) arKey, nKeyLength, h, pData, nDataSize, pDest) 
    197197 
    198198#   define zend_u_hash_update(ht, type, arKey, nKeyLength, pData, nDataSize, pDest) \ 
    199        zend_hash_update(ht, arKey, nKeyLength, pData, nDataSize, pDest) 
     199       zend_hash_update(ht, ZEND_24((char *), NOTHING) arKey, nKeyLength, pData, nDataSize, pDest) 
    200200 
    201201#   define zend_u_hash_quick_update(ht, type, arKey, nKeyLength, h, pData, nDataSize, pDest) \ 
    202        zend_hash_quick_update(ht, arKey, nKeyLength, h, pData, nDataSize, pDest) 
     202       zend_hash_quick_update(ht, ZEND_24((char *), NOTHING) arKey, nKeyLength, h, pData, nDataSize, pDest) 
    203203 
    204204#   define zend_u_hash_find(ht, type, arKey, nKeyLength, pData) \ 
    205        zend_hash_find(ht, arKey, nKeyLength, pData) 
     205       zend_hash_find(ht, ZEND_24((char *), NOTHING) arKey, nKeyLength, pData) 
    206206 
    207207#   define zend_u_hash_quick_find(ht, type, arKey, nKeyLength, h, pData) \ 
    208        zend_hash_quick_find(ht, arKey, nKeyLength, h, pData) 
     208       zend_hash_quick_find(ht, ZEND_24((char *), NOTHING) arKey, nKeyLength, h, pData) 
     209 
     210#   define zend_u_hash_exists(ht, type, arKey, nKeyLength) \ 
     211       zend_hash_exists(ht, ZEND_24((char *), NOTHING) arKey, nKeyLength) 
    209212 
    210213#   define add_u_assoc_zval_ex(arg, type, key, key_len, value) \ 
     
    438441 
    439442    int    filepath_len; 
    440     ZEND_24(const) char *filepath; 
     443    ZEND_24(NOTHING, const) char *filepath; 
    441444    int    dirpath_len; 
    442445    char  *dirpath; 
Note: See TracChangeset for help on using the changeset viewer.