fixed #236: kill gcc false warning
git-svn-id: svn://svn.lighttpd.net/xcache/trunk@770 c26eb9a1-5813-0410-bd6c-c2e55f420ca73.0
parent
13e183586f
commit
e24c0af4f1
|
@ -140,7 +140,7 @@ IFASSERT(`
|
|||
#undef C_RELAYLINE
|
||||
#define C_RELAYLINE , __LINE__
|
||||
')
|
||||
static inline void xc_calc_string_n(xc_processor_t *processor, zend_uchar type, const zstr const str, long size IFASSERT(`, int relayline')) {
|
||||
static inline void xc_calc_string_n(xc_processor_t *processor, zend_uchar type, const_zstr const str, long size IFASSERT(`, int relayline')) {
|
||||
pushdef(`__LINE__', `relayline')
|
||||
int realsize = UNISW(size, (type == IS_UNICODE) ? UBYTES(size) : size);
|
||||
long dummy = 1;
|
||||
|
@ -162,7 +162,7 @@ static inline void xc_calc_string_n(xc_processor_t *processor, zend_uchar type,
|
|||
/* }}} */
|
||||
/* {{{ xc_store_string_n */
|
||||
REDEF(`KIND', `store')
|
||||
static inline zstr xc_store_string_n(xc_processor_t *processor, zend_uchar type, const zstr const str, long size IFASSERT(`, int relayline')) {
|
||||
static inline zstr xc_store_string_n(xc_processor_t *processor, zend_uchar type, const_zstr const str, long size IFASSERT(`, int relayline')) {
|
||||
pushdef(`__LINE__', `relayline')
|
||||
int realsize = UNISW(size, (type == IS_UNICODE) ? UBYTES(size) : size);
|
||||
zstr ret, *pret;
|
||||
|
|
2
xcache.h
2
xcache.h
|
@ -137,6 +137,7 @@ typedef znode znode_op;
|
|||
|
||||
#ifndef IS_UNICODE
|
||||
typedef char *zstr;
|
||||
typedef const char *const_zstr;
|
||||
# define ZSTR_S(s) (s)
|
||||
# define ZSTR_U(s) (s)
|
||||
# define ZSTR_V(s) (s)
|
||||
|
@ -144,6 +145,7 @@ typedef char *zstr;
|
|||
# define ZSTR_PU(s) (s)
|
||||
# define ZSTR_PV(s) (s)
|
||||
#else
|
||||
typedef const zstr const_zstr;
|
||||
# define ZSTR_S(zs) ((zs).s)
|
||||
# define ZSTR_U(zs) ((zs).u)
|
||||
# define ZSTR_V(zs) ((zs).v)
|
||||
|
|
Loading…
Reference in New Issue