Browse Source

disassembler: fix: compile against correct const string for PHP 5.2, use 5.3 version of strings is enough

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@1254 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
3.1
Xuefer 8 years ago
parent
commit
c1d9d863a7
  1. 10
      devel/prepare.mak
  2. 2
      xcache/xc_const_string.c

10
devel/prepare.mak

@ -20,7 +20,6 @@ xc_const_string: \
xcache/xc_const_string_opcodes_php4.x.h \
xcache/xc_const_string_opcodes_php5.0.h \
xcache/xc_const_string_opcodes_php5.1.h \
xcache/xc_const_string_opcodes_php5.2.h \
xcache/xc_const_string_opcodes_php5.3.h \
xcache/xc_const_string_opcodes_php5.4.h \
xcache/xc_const_string_opcodes_php5.5.h \
@ -62,15 +61,6 @@ xcache/xc_const_string_opcodes_php5.1.h: ${PHP5_1_DIR}/Zend/zend_vm_def.h
mv "$@.tmp" "$@"
endif
ifeq (${PHP5_2_DIR},)
xcache/xc_const_string_opcodes_php5.2.h: dummy
@echo "Skipped $@: PHP_5_2_DIR not set"
else
xcache/xc_const_string_opcodes_php5.2.h: ${PHP5_2_DIR}/Zend/zend_vm_def.h
$(AWK) -f ./devel/gen_const_string_opcodes.awk < "$<" > "$@.tmp"
mv "$@.tmp" "$@"
endif
ifeq (${PHP5_3_DIR},)
xcache/xc_const_string_opcodes_php5.3.h: dummy
@echo "Skipped $@: PHP_5_3_DIR not set"

2
xcache/xc_const_string.c

@ -67,7 +67,7 @@ const char *xc_get_data_type(zend_uchar data_type)
# include "xc_const_string_opcodes_php5.5.h"
#elif defined(ZEND_ENGINE_2_4)
# include "xc_const_string_opcodes_php5.4.h"
#elif defined(ZEND_ENGINE_2_3)
#elif defined(ZEND_ENGINE_2_2)
# include "xc_const_string_opcodes_php5.3.h"
#elif defined(ZEND_ENGINE_2_1)
# include "xc_const_string_opcodes_php5.1.h"

Loading…
Cancel
Save