Browse Source

Processor: fix type processor_t conflict with Mac OS X

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@178 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
1.2
Xuefer 15 years ago
parent
commit
eb41ec3baf
  1. 20
      processor/head.m4
  2. 6
      processor/struct.m4

20
processor/head.m4

@ -53,8 +53,8 @@ typedef char zstr_char;
#define MAX_DUP_STR_LEN 256
dnl }}}
/* export: typedef struct _processor_t processor_t; :export {{{ */
struct _processor_t {
/* export: typedef struct _xc_processor_t xc_processor_t; :export {{{ */
struct _xc_processor_t {
char *p;
zend_uint size;
HashTable strings;
@ -116,7 +116,7 @@ static inline int xc_zstrlen(int type, zstr s)
#endif
/* {{{ xc_calc_string_n */
REDEF(`KIND', `calc')
static inline void xc_calc_string_n(processor_t *processor, zend_uchar type, zstr str, long size IFASSERT(`, int relayline')) {
static inline void xc_calc_string_n(xc_processor_t *processor, zend_uchar type, zstr str, long size IFASSERT(`, int relayline')) {
pushdef(`__LINE__', `relayline')
int realsize = UNISW(size, (type == IS_UNICODE) ? UBYTES(size) : size);
long dummy = 1;
@ -138,7 +138,7 @@ static inline void xc_calc_string_n(processor_t *processor, zend_uchar type, zst
/* }}} */
/* {{{ xc_store_string_n */
REDEF(`KIND', `store')
static inline zstr xc_store_string_n(processor_t *processor, zend_uchar type, zstr str, long size IFASSERT(`, int relayline')) {
static inline zstr xc_store_string_n(xc_processor_t *processor, zend_uchar type, zstr str, long size IFASSERT(`, int relayline')) {
pushdef(`__LINE__', `relayline')
int realsize = UNISW(size, (type == IS_UNICODE) ? UBYTES(size) : size);
zstr ret, *pret;
@ -165,7 +165,7 @@ static inline zstr xc_store_string_n(processor_t *processor, zend_uchar type, zs
/* {{{ xc_get_class_num
* return class_index + 1
*/
static zend_ulong xc_get_class_num(processor_t *processor, zend_class_entry *ce) {
static zend_ulong xc_get_class_num(xc_processor_t *processor, zend_class_entry *ce) {
zend_ulong i;
const xc_entry_t *xce = processor->xce_src;
zend_class_entry *ceptr;
@ -187,7 +187,7 @@ static zend_ulong xc_get_class_num(processor_t *processor, zend_class_entry *ce)
/* }}} */
/* {{{ xc_get_class */
#ifdef ZEND_ENGINE_2
static zend_class_entry *xc_get_class(processor_t *processor, zend_ulong class_num) {
static zend_class_entry *xc_get_class(xc_processor_t *processor, zend_ulong class_num) {
/* must be parent or currrent class */
assert(class_num <= processor->active_class_num);
return CestToCePtr(processor->xce_dst->data.php->classinfos[class_num - 1].cest);
@ -196,7 +196,7 @@ static zend_class_entry *xc_get_class(processor_t *processor, zend_ulong class_n
/* }}} */
#ifdef ZEND_ENGINE_2
/* fix method on store */
static void xc_fix_method(processor_t *processor, zend_op_array *dst) /* {{{ */
static void xc_fix_method(xc_processor_t *processor, zend_op_array *dst) /* {{{ */
{
zend_function *zf = (zend_function *) dst;
zend_class_entry *ce = processor->active_class_entry_dst;
@ -250,7 +250,7 @@ dnl ================ export API
/* export: xc_entry_t *xc_processor_store_xc_entry_t(xc_entry_t *src TSRMLS_DC); :export {{{ */
xc_entry_t *xc_processor_store_xc_entry_t(xc_entry_t *src TSRMLS_DC) {
xc_entry_t *dst;
processor_t processor;
xc_processor_t processor;
memset(&processor, 0, sizeof(processor));
if (src->type == XC_TYPE_VAR) {
@ -323,7 +323,7 @@ err_alloc:
/* }}} */
/* export: xc_entry_t *xc_processor_restore_xc_entry_t(xc_entry_t *dst, const xc_entry_t *src, zend_bool readonly_protection TSRMLS_DC); :export {{{ */
xc_entry_t *xc_processor_restore_xc_entry_t(xc_entry_t *dst, const xc_entry_t *src, zend_bool readonly_protection TSRMLS_DC) {
processor_t processor;
xc_processor_t processor;
memset(&processor, 0, sizeof(processor));
processor.readonly_protection = readonly_protection;
@ -334,7 +334,7 @@ xc_entry_t *xc_processor_restore_xc_entry_t(xc_entry_t *dst, const xc_entry_t *s
/* }}} */
/* export: zval *xc_processor_restore_zval(zval *dst, const zval *src TSRMLS_DC); :export {{{ */
zval *xc_processor_restore_zval(zval *dst, const zval *src TSRMLS_DC) {
processor_t processor;
xc_processor_t processor;
memset(&processor, 0, sizeof(processor));
processor.reference = 1;

6
processor/struct.m4

@ -8,9 +8,9 @@ define(`DECL_STRUCT_P_FUNC', `translit(
ifdef(`EXPORT_'ifelse(`$2', `', `$1', `$2'), `void', `static void inline')
FUNC_NAME`'(
IFDPRINT( `const $1 * const src, int indent')
IFCALC( `processor_t *processor, const $1 * const src')
IFSTORE( `processor_t *processor, $1 *dst, const $1 * const src')
IFRESTORE(`processor_t *processor, $1 *dst, const $1 * const src')
IFCALC( `xc_processor_t *processor, const $1 * const src')
IFSTORE( `xc_processor_t *processor, $1 *dst, const $1 * const src')
IFRESTORE(`xc_processor_t *processor, $1 *dst, const $1 * const src')
IFDASM( `zval *dst, const $1 * const src')
IFASM( `$1 *dst, const $1 * const src')
TSRMLS_DC

Loading…
Cancel
Save