Browse Source

void empty agument for macro for vc6

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@19 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
1.1
Xuefer 15 years ago
parent
commit
d7d686435c
  1. 4
      utils.c
  2. 8
      xcache.c
  3. 1
      xcache.h

4
utils.c

@ -282,7 +282,7 @@ void xc_install_function(char *filename, zend_function *func, zend_uchar type, c
ZESW(xc_cest_t *, void) xc_install_class(char *filename, xc_cest_t *cest, zend_uchar type, void *key, uint len TSRMLS_DC) /* {{{ */
{
zend_class_entry *cep = CestToCePtr(*cest);
ZESW(void *stored_ce_ptr, );
ZESW(void *stored_ce_ptr, NOTHING);
if (zend_u_hash_add(CG(class_table), type, key, len,
cest, sizeof(xc_cest_t),
@ -293,7 +293,7 @@ ZESW(xc_cest_t *, void) xc_install_class(char *filename, xc_cest_t *cest, zend_u
CG(zend_lineno) = ZESW(0, cep->line_start);
zend_error(E_ERROR, "Cannot redeclare class %s", (char *) cep->name);
}
ZESW(return (xc_cest_t *) stored_ce_ptr, );
ZESW(return (xc_cest_t *) stored_ce_ptr, NOTHING);
}
/* }}} */

8
xcache.c

@ -498,7 +498,7 @@ static int xc_stat(const char *filename, const char *include_path, struct stat *
#define HASH_NUM(n) HASH(n)
static inline xc_hash_value_t xc_entry_hash_var(xc_entry_t *xce) /* {{{ */
{
return UNISW(, UG(unicode) ? HASH_USTR_L(xce->name_type, (char *)xce->name.ustr.val, xce->name.ustr.len) :)
return UNISW(NOTHING, UG(unicode) ? HASH_USTR_L(xce->name_type, (char *)xce->name.ustr.val, xce->name.ustr.len) :)
HASH_STR_L(xce->name.str.val, xce->name.str.len);
}
/* }}} */
@ -548,7 +548,7 @@ static int xc_entry_init_key_php(xc_entry_t *xce, char *filename TSRMLS_DC) /* {
return 0;
}
UNISW(, xce->name_type = IS_STRING;)
UNISW(NOTHING, xce->name_type = IS_STRING;)
xce->name.str.val = filename;
xce->name.str.len = strlen(filename);
@ -707,7 +707,7 @@ static zend_op_array *xc_compile_file(zend_file_handle *h, int type TSRMLS_DC) /
assert(i < php.funcinfo_cnt);
assert(b->pData);
memcpy(&fi->func, b->pData, sizeof(zend_function));
UNISW(, fi->type = b->key.type;)
UNISW(NOTHING, fi->type = b->key.type;)
fi->key = BUCKET_KEY(b);
fi->key_size = b->nKeyLength;
}
@ -719,7 +719,7 @@ static zend_op_array *xc_compile_file(zend_file_handle *h, int type TSRMLS_DC) /
assert(i < php.classinfo_cnt);
assert(b->pData);
memcpy(&ci->cest, b->pData, sizeof(xc_cest_t));
UNISW(, ci->type = b->key.type;)
UNISW(NOTHING, ci->type = b->key.type;)
ci->key = BUCKET_KEY(b);
ci->key_size = b->nKeyLength;
/* need to fix inside store */

1
xcache.h

@ -27,6 +27,7 @@
# define ZEND_ENGINE_2_1
#endif
#define NOTHING
/* ZendEngine code Switcher */
#ifndef ZEND_ENGINE_2
# define ZESW(v1, v2) v1

Loading…
Cancel
Save