Change to using the #define's

4 files changed, 13 insertions, 13 deletions

diff --git a/Zend/zend-scanner.l b/Zend/zend-scanner.l
index 78c4497f54..98707a857b 100644
--- a/Zend/zend-scanner.l
+++ b/Zend/zend-scanner.l
@@ -316,19 +316,19 @@ ZEND_API int open_file_for_scanning(zend_file_handle *file_handle CLS_DC)
 END_EXTERN_C()
 
 
-ZEND_API zend_op_array *compile_files(int mark_as_ref CLS_DC, int file_count, ...)
+ZEND_API zend_op_array *compile_files(int type CLS_DC, int file_count, ...)
 {
 	va_list files;
 	zend_op_array *op_array;
 
 	va_start(files, file_count);
-	op_array = v_compile_files(mark_as_ref CLS_CC, file_count, files);
+	op_array = v_compile_files(type CLS_CC, file_count, files);
 	va_end(files);
 	return op_array;
 }
 
 
-ZEND_API zend_op_array *v_compile_files(int mark_as_ref CLS_DC, int file_count, va_list files)
+ZEND_API zend_op_array *v_compile_files(int type CLS_DC, int file_count, va_list files)
 {
 	zend_lex_state original_lex_state;
 	zend_op_array *op_array = (zend_op_array *) emalloc(sizeof(zend_op_array));
@@ -401,7 +401,7 @@ ZEND_API zend_op_array *v_compile_files(int mark_as_ref CLS_DC, int file_count,
 }
 
 
-zend_op_array *compile_filename(int mode, zval *filename CLS_DC ELS_DC)
+zend_op_array *compile_filename(int type, zval *filename CLS_DC ELS_DC)
 {
 	zend_file_handle file_handle;
 	zval tmp;
@@ -420,16 +420,16 @@ zend_op_array *compile_filename(int mode, zval *filename CLS_DC ELS_DC)
 	file_handle.opened_path = NULL;
 
 
-	if (mode==ZEND_REQUIRE) {
+	if (type==ZEND_REQUIRE) {
 		/* We don't want to hear about inclusion failures;  If we fail,
 		 * we'll generate a require failure
 		 */
 		error_reporting = EG(error_reporting);
 		EG(error_reporting) = 0;
 	}
-	retval = zend_compile_files(1 CLS_CC, 1, &file_handle);
+	retval = zend_compile_files(type CLS_CC, 1, &file_handle);
 
-	if (mode==ZEND_REQUIRE) {
+	if (type==ZEND_REQUIRE) {
 		EG(error_reporting) = error_reporting;
 		if (!retval) {
 			zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, filename->value.str.val);
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index ef9c5631b7..e635079821 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -26,7 +26,7 @@
 #include "zend_fast_cache.h"
 
 
-ZEND_API zend_op_array *(*zend_compile_files)(int mark_as_ref CLS_DC, int file_count, ...);
+ZEND_API zend_op_array *(*zend_compile_files)(int type CLS_DC, int file_count, ...);
 
 
 #ifndef ZTS
diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index 2ae0b06a24..b24182287d 100644
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -205,7 +205,7 @@ BEGIN_EXTERN_C()
 void init_compiler(CLS_D ELS_DC);
 void shutdown_compiler(CLS_D);
 
-extern ZEND_API zend_op_array *(*zend_compile_files)(int mark_as_ref CLS_DC, int file_count, ...);
+extern ZEND_API zend_op_array *(*zend_compile_files)(int type CLS_DC, int file_count, ...);
 
 void zend_activate(CLS_D ELS_DC);
 void zend_deactivate(CLS_D ELS_DC);
@@ -368,10 +368,10 @@ void do_ticks(CLS_D);
 ZEND_API int require_file(zend_file_handle *file_handle, zend_bool unique CLS_DC);	
 ZEND_API int require_filename(char *filename, zend_bool unique CLS_DC);
 ZEND_API int use_filename(char *filename, uint filename_length CLS_DC);
-ZEND_API zend_op_array *compile_files(int mark_as_ref CLS_DC, int file_count, ...);
-ZEND_API zend_op_array *v_compile_files(int mark_as_ref CLS_DC, int file_count, va_list files);
+ZEND_API zend_op_array *compile_files(int type CLS_DC, int file_count, ...);
+ZEND_API zend_op_array *v_compile_files(int type CLS_DC, int file_count, va_list files);
 ZEND_API zend_op_array *compile_string(zval *source_string CLS_DC);	
-ZEND_API zend_op_array *compile_filename(int mode, zval *filename CLS_DC ELS_DC);
+ZEND_API zend_op_array *compile_filename(int type, zval *filename CLS_DC ELS_DC);
 ZEND_API int open_file_for_scanning(zend_file_handle *file_handle CLS_DC);
 ZEND_API void init_op_array(zend_op_array *op_array, int initial_ops_size);
 ZEND_API void destroy_op_array(zend_op_array *op_array);
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 3929e3a5e8..f00955ab6e 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -2056,7 +2056,7 @@ send_by_ref:
 								
 								if (file_handle.handle.fp) {
 									if (!opened_path || zend_hash_add(&EG(included_files), opened_path, strlen(opened_path)+1, (void *)&dummy, sizeof(int), NULL)==SUCCESS) {
-										new_op_array = compile_files(1 CLS_CC, 1, &file_handle);
+										new_op_array = compile_files(ZEND_INCLUDE CLS_CC, 1, &file_handle);
 										if (new_op_array) {
 											pass_include_eval(new_op_array);
 										} else {