Rename C0x-inline to C9x-inline, and frame preprocessor directives in

zend_gcc_inline.c with #ifndef C9X_INLINE_SEMANTICS..#endif.

diff --git a/Zend/Zend.m4 b/Zend/Zend.m4
index d80cb694b7aa9ae050007e0cb8dcf60154f08329..227eefdf74fe3bb28eaf98248bde93b0708acddc 100644 (file)
--- a/Zend/Zend.m4
+++ b/Zend/Zend.m4
@@ -101,10 +101,10 @@ AC_ARG_ENABLE(debug,
 AC_DEFUN(LIBZEND_OTHER_CHECKS,[
 
 AC_ARG_ENABLE(c0x-inline,
-[  --enable-c0x-inline     Enable C0x-inline semantics],[
-  ZEND_C0X_INLINE=$enableval
+[  --enable-c0x-inline     Enable C9x-inline semantics],[
+  ZEND_C9X_INLINE=$enableval
 ],[
-  ZEND_C0X_INLINE=no
+  ZEND_C9X_INLINE=no
 ])
 
 AC_ARG_ENABLE(experimental-zts,
@@ -129,8 +129,8 @@ AC_ARG_ENABLE(memory-limit,
   ZEND_MEMORY_LIMIT=no
 ])
 
-AC_MSG_CHECKING(whether to enable C0x-inline semantics)
-AC_MSG_RESULT($ZEND_C0X_INLINE)
+AC_MSG_CHECKING(whether to enable C9x-inline semantics)
+AC_MSG_RESULT($ZEND_C9X_INLINE)
 
 AC_MSG_CHECKING(whether to enable experimental ZTS)
 AC_MSG_RESULT($ZEND_EXPERIMENTAL_ZTS)
@@ -165,8 +165,8 @@ else
   ZEND_SCANNER_TYPE=c
 fi  
 
-if test "$ZEND_C0X_INLINE" = "yes"; then
-  AC_DEFINE(C0X_INLINE_SEMANTICS, 1, [whether to enable C0x-inline semantics])
+if test "$ZEND_C9X_INLINE" = "yes"; then
+  AC_DEFINE(C9X_INLINE_SEMANTICS, 1, [whether to enable C9x-inline semantics])
 else
   ZEND_GCC=libZend_gcc.la
   AC_SUBST(ZEND_GCC)

diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h
index 490f44c1d3be9a147d5ce348f22d9883b779f165..4707991a443174ede852f7a38169b6017ce2c124 100644 (file)
--- a/Zend/zend_execute.h
+++ b/Zend/zend_execute.h
@@ -55,7 +55,7 @@ void shutdown_executor(ELS_D);
 void execute(zend_op_array *op_array ELS_DC);
 ZEND_API int zend_is_true(zval *op);
 ZEND_API inline void safe_free_zval_ptr(zval *p)
-#if defined(C0X_INLINE_SEMANTICS)
+#if defined(C9X_INLINE_SEMANTICS)
 {
        ELS_FETCH();
 
@@ -69,7 +69,7 @@ ZEND_API inline void safe_free_zval_ptr(zval *p)
 
 ZEND_API int zend_eval_string(char *str, zval *retval_ptr CLS_DC ELS_DC);
 ZEND_API inline int i_zend_is_true(zval *op)
-#if defined(C0X_INLINE_SEMANTICS)
+#if defined(C9X_INLINE_SEMANTICS)
 {
        int result;
 
@@ -113,7 +113,7 @@ ZEND_API int zval_update_constant(zval **pp, void *arg);
 
 /* dedicated Zend executor functions - do not use! */
 ZEND_API inline void zend_ptr_stack_clear_multiple(ELS_D)
-#if defined(C0X_INLINE_SEMANTICS)
+#if defined(C9X_INLINE_SEMANTICS)
 {
        void **p = EG(argument_stack).top_element-2;
        int delete_count = (ulong) *p;
@@ -129,7 +129,7 @@ ZEND_API inline void zend_ptr_stack_clear_multiple(ELS_D)
 #endif
 
 ZEND_API inline int zend_ptr_stack_get_arg(int requested_arg, void **data ELS_DC)
-#if defined(C0X_INLINE_SEMANTICS)
+#if defined(C9X_INLINE_SEMANTICS)
 {
        void **p = EG(argument_stack).top_element-2;
        int arg_count = (ulong) *p;
@@ -161,7 +161,7 @@ ZEND_API zend_bool zend_is_executing(void);
 #define active_opline (*EG(opline_ptr))
 
 ZEND_API inline void zend_assign_to_variable_reference(znode *result, zval **variable_ptr_ptr, zval **value_ptr_ptr, temp_variable *Ts ELS_DC)
-#if defined(C0X_INLINE_SEMANTICS)
+#if defined(C9X_INLINE_SEMANTICS)
 {
        zval *variable_ptr = *variable_ptr_ptr;
        zval *value_ptr;

diff --git a/Zend/zend_gcc_inline.c b/Zend/zend_gcc_inline.c
index 6c92a1fbf1f7e0bc3095487320b31f97fffba817..439cd17b295136fe0608caf41efaef24c7f81cf5 100644 (file)
--- a/Zend/zend_gcc_inline.c
+++ b/Zend/zend_gcc_inline.c
@@ -1,7 +1,17 @@
 
-#define C0X_INLINE_SEMANTICS
+/*
+ * If C9X_INLINE_SEMANTICS is already defined here,
+ * we assume the user does not want GCC inline semantics,
+ * but compiles this file always.
+ */
+
+#ifndef C9X_INLINE_SEMANTICS
+
+#define C9X_INLINE_SEMANTICS
 
 #include "zend.h"
 
 #include "zend_execute.h"
 #include "zend_operators.h"
+
+#endif

diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h
index c522b1d492da0b4a5b388c9f1b0a70b3d27250cf..20369c7fd525a4e74d6e9bd4cb2b33a446ee0ff7 100644 (file)
--- a/Zend/zend_operators.h
+++ b/Zend/zend_operators.h
@@ -50,7 +50,7 @@ ZEND_API int is_not_equal_function(zval *result, zval *op1, zval *op2);
 ZEND_API int is_smaller_function(zval *result, zval *op1, zval *op2);
 ZEND_API int is_smaller_or_equal_function(zval *result, zval *op1, zval *op2);
 ZEND_API inline int is_numeric_string(char *str, int length, long *lval, double *dval)
-#if defined(C0X_INLINE_SEMANTICS)
+#if defined(C9X_INLINE_SEMANTICS)
 {
        long local_lval;
        double local_dval;