Index: /trunk/mod_cacher/xc_cacher.c
===================================================================
--- /trunk/mod_cacher/xc_cacher.c	(revision 1150)
+++ /trunk/mod_cacher/xc_cacher.c	(revision 1151)
@@ -763,5 +763,5 @@
 	ALLOCA_FLAG(use_heap)
 	/* new ptr which is stored inside CG(class_table) */
-	xc_cest_t **new_cest_ptrs = (xc_cest_t **)my_do_alloca(sizeof(xc_cest_t*) * p->classinfo_cnt, use_heap);
+	xc_cest_t **new_cest_ptrs = (xc_cest_t **)xc_do_alloca(sizeof(xc_cest_t*) * p->classinfo_cnt, use_heap);
 #endif
 
@@ -829,5 +829,5 @@
 
 #ifndef ZEND_ENGINE_2
-	my_free_alloca(new_cest_ptrs, use_heap);
+	xc_free_alloca(new_cest_ptrs, use_heap);
 #endif
 	CG(active_op_array) = old_active_op_array;
@@ -950,5 +950,5 @@
 
 	size = strlen(PG(include_path)) + 1;
-	paths = (char *)my_do_alloca(size, use_heap);
+	paths = (char *)xc_do_alloca(size, use_heap);
 	memcpy(paths, PG(include_path), size);
 
@@ -985,5 +985,5 @@
 
 finish:
-	my_free_alloca(paths, use_heap);
+	xc_free_alloca(paths, use_heap);
 
 	return ret;
@@ -2549,5 +2549,5 @@
 	name##_buffer.alloca_size = xc_var_buffer_alloca_size(name TSRMLS_CC); \
 	name##_buffer.buffer = name##_buffer.alloca_size \
-		? my_do_alloca(name##_buffer.alloca_size, name##_buffer.useheap) \
+		? xc_do_alloca(name##_buffer.alloca_size, name##_buffer.useheap) \
 		: UNISW(Z_STRVAL_P(name), Z_TYPE(name) == IS_UNICODE ? Z_USTRVAL_P(name) : Z_STRVAL_P(name)); \
 	if (name##_buffer.alloca_size) xc_var_buffer_init(name##_buffer.buffer, name TSRMLS_CC);
@@ -2555,5 +2555,5 @@
 #define VAR_BUFFER_FREE(name) \
 	if (name##_buffer.alloca_size) { \
-		my_free_alloca(name##_buffer.buffer, name##_buffer.useheap); \
+		xc_free_alloca(name##_buffer.buffer, name##_buffer.useheap); \
 	}
 
Index: /trunk/mod_coverager/xc_coverager.c
===================================================================
--- /trunk/mod_coverager/xc_coverager.c	(revision 1150)
+++ /trunk/mod_coverager/xc_coverager.c	(revision 1151)
@@ -47,5 +47,5 @@
 
 	TRACE("mkdirs %s %d %s %d", root, rootlen, path, pathlen);
-	fullpath = my_do_alloca(rootlen + pathlen + 1, use_heap);
+	fullpath = xc_do_alloca(rootlen + pathlen + 1, use_heap);
 	memcpy(fullpath, root, rootlen);
 	memcpy(fullpath + rootlen, path, pathlen);
@@ -68,5 +68,5 @@
 #endif
 	}
-	my_free_alloca(fullpath, use_heap);
+	xc_free_alloca(fullpath, use_heap);
 }
 /* }}} */
Index: /trunk/mod_optimizer/xc_optimizer.c
===================================================================
--- /trunk/mod_optimizer/xc_optimizer.c	(revision 1150)
+++ /trunk/mod_optimizer/xc_optimizer.c	(revision 1151)
@@ -392,9 +392,9 @@
 	ALLOCA_FLAG(use_heap_catchbbids)
 	ALLOCA_FLAG(use_heap_markbbhead)
-	bbid_t *bbids          = my_do_alloca(count * sizeof(bbid_t),    use_heap_bbids);
-#ifdef ZEND_ENGINE_2
-	bbid_t *catchbbids     = my_do_alloca(count * sizeof(bbid_t),    use_heap_catchbbids);
-#endif
-	zend_bool *markbbhead  = my_do_alloca(count * sizeof(zend_bool), use_heap_markbbhead);
+	bbid_t *bbids          = xc_do_alloca(count * sizeof(bbid_t),    use_heap_bbids);
+#ifdef ZEND_ENGINE_2
+	bbid_t *catchbbids     = xc_do_alloca(count * sizeof(bbid_t),    use_heap_catchbbids);
+#endif
+	zend_bool *markbbhead  = xc_do_alloca(count * sizeof(zend_bool), use_heap_markbbhead);
 
 	/* {{{ mark jmpin/jumpout */
@@ -503,9 +503,9 @@
 	/* }}} */
 
-	my_free_alloca(markbbhead, use_heap_markbbhead);
-#ifdef ZEND_ENGINE_2
-	my_free_alloca(catchbbids, use_heap_catchbbids);
-#endif
-	my_free_alloca(bbids,      use_heap_bbids);
+	xc_free_alloca(markbbhead, use_heap_markbbhead);
+#ifdef ZEND_ENGINE_2
+	xc_free_alloca(catchbbids, use_heap_catchbbids);
+#endif
+	xc_free_alloca(bbids,      use_heap_bbids);
 	return SUCCESS;
 }
Index: /trunk/xcache/xc_compatibility.h
===================================================================
--- /trunk/xcache/xc_compatibility.h	(revision 1150)
+++ /trunk/xcache/xc_compatibility.h	(revision 1151)
@@ -38,12 +38,12 @@
 
 #ifdef do_alloca_with_limit
-#	define my_do_alloca(size, use_heap) do_alloca_with_limit(size, use_heap)
-#	define my_free_alloca(size, use_heap) free_alloca_with_limit(size, use_heap)
+#	define xc_do_alloca(size, use_heap) do_alloca_with_limit(size, use_heap)
+#	define xc_free_alloca(size, use_heap) free_alloca_with_limit(size, use_heap)
 #elif defined(ALLOCA_FLAG)
-#	define my_do_alloca(size, use_heap) do_alloca(size, use_heap)
-#	define my_free_alloca(size, use_heap) free_alloca(size, use_heap)
-#else
-#	define my_do_alloca(size, use_heap) do_alloca(size)
-#	define my_free_alloca(size, use_heap) free_alloca(size)
+#	define xc_do_alloca(size, use_heap) do_alloca(size, use_heap)
+#	define xc_free_alloca(size, use_heap) free_alloca(size, use_heap)
+#else
+#	define xc_do_alloca(size, use_heap) do_alloca(size)
+#	define xc_free_alloca(size, use_heap) free_alloca(size)
 #	define ALLOCA_FLAG(x)
 #endif
@@ -68,26 +68,26 @@
 /* {{{ dirty fix for PHP 6 */
 #ifdef add_assoc_long_ex
-static inline void my_add_assoc_long_ex(zval *arg, char *key, uint key_len, long value)
+static inline void xc_add_assoc_long_ex(zval *arg, char *key, uint key_len, long value)
 {
 	add_assoc_long_ex(arg, key, key_len, value);
 }
 #	undef add_assoc_long_ex
-#	define add_assoc_long_ex my_add_assoc_long_ex
+#	define add_assoc_long_ex xc_add_assoc_long_ex
 #endif
 #ifdef add_assoc_bool_ex
-static inline void my_add_assoc_bool_ex(zval *arg, char *key, uint key_len, zend_bool value)
+static inline void xc_add_assoc_bool_ex(zval *arg, char *key, uint key_len, zend_bool value)
 {
 	add_assoc_bool_ex(arg, key, key_len, value);
 }
 #	undef add_assoc_bool_ex
-#	define add_assoc_bool_ex my_add_assoc_bool_ex
+#	define add_assoc_bool_ex xc_add_assoc_bool_ex
 #endif
 #ifdef add_assoc_null_ex
-static inline void my_add_assoc_null_ex(zval *arg, char *key, uint key_len)
+static inline void xc_add_assoc_null_ex(zval *arg, char *key, uint key_len)
 {
 	add_assoc_null_ex(arg, key, key_len);
 }
 #	undef add_assoc_null_ex
-#	define add_assoc_null_ex my_add_assoc_null_ex
+#	define add_assoc_null_ex xc_add_assoc_null_ex
 #endif
 /* }}} */