main/ conflict with php/main/

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@987 c26eb9a1-5813-0410-bd6c-c2e55f420ca7

Makefile.frag

@@ -1,7 +1,7 @@
 XCACHE_PROC_SRC=$(srcdir)/processor/main.m4
 XCACHE_PROC_OUT=$(builddir)/processor.out
-XCACHE_PROC_C=$(builddir)/main/xc_processor_real.c
-XCACHE_PROC_H=$(builddir)/main/xc_processor.h
+XCACHE_PROC_C=$(builddir)/xcache/xc_processor_real.c
+XCACHE_PROC_H=$(builddir)/xcache/xc_processor.h
 XCACHE_INCLUDES_SRC=$(srcdir)/includes.c
 XCACHE_INCLUDES_I=$(builddir)/includes.i
 XCACHE_STRUCTINFO_OUT=$(builddir)/structinfo.m4
@@ -25,13 +25,13 @@ $(XCACHE_PROC_C): $(XCACHE_PROC_OUT) $(XCACHE_PROC_H)
 	cp $(XCACHE_PROC_OUT) $(XCACHE_PROC_C)
 	-$(XCACHE_INDENT) < $(XCACHE_PROC_OUT) > $(XCACHE_PROC_C).tmp && mv $(XCACHE_PROC_C).tmp $(XCACHE_PROC_C)
 
-$(builddir)/main/xc_processor.lo: $(XCACHE_PROC_C) $(XCACHE_PROC_H) $(srcdir)/main/xc_processor.c
+$(builddir)/xcache/xc_processor.lo: $(XCACHE_PROC_C) $(XCACHE_PROC_H) $(srcdir)/xcache/xc_processor.c
 
-$(builddir)/submodules/xc_disassembler.lo: $(XCACHE_PROC_H) $(srcdir)/main/xc_processor.c
+$(builddir)/submodules/xc_disassembler.lo: $(XCACHE_PROC_H) $(srcdir)/xcache/xc_processor.c
 
 $(builddir)/xc_opcode_spec.lo: $(srcdir)/xcache.h $(srcdir)/xc_opcode_spec.c $(srcdir)/xc_opcode_spec_def.h $(srcdir)/xc_const_string.h
 
-$(builddir)/xcache.lo: $(XCACHE_PROC_H) $(srcdir)/main/xc_shm.h $(srcdir)/util/xc_stack.h $(srcdir)/xcache_globals.h $(srcdir)/xcache.c $(srcdir)/util/xc_foreachcoresig.h $(srcdir)/main/xc_utils.h
+$(builddir)/xcache.lo: $(XCACHE_PROC_H) $(srcdir)/xcache/xc_shm.h $(srcdir)/util/xc_stack.h $(srcdir)/xcache_globals.h $(srcdir)/xcache.c $(srcdir)/util/xc_foreachcoresig.h $(srcdir)/xcache/xc_utils.h
 
 xcachesvnclean: clean
 	cat $(srcdir)/.cvsignore | grep -v ^Makefile | grep -v ^config.nice | xargs rm -rf

config.m4

@@ -24,17 +24,17 @@ if test "$PHP_XCACHE" != "no"; then
   fi
 
   xcache_sources="
-                  main/xc_const_string.c \
-                  main/xc_lock.c \
-                  main/xc_mem.c \
-                  main/xc_opcode_spec.c \
-                  main/xc_processor.c \
-                  main/xc_sandbox.c \
-                  main/xc_shm.c \
-                  main/xc_shm_mmap.c \
-                  main/xc_utils.c \
                   util/xc_stack.c \
                   xcache.c \
+                  xcache/xc_const_string.c \
+                  xcache/xc_lock.c \
+                  xcache/xc_mem.c \
+                  xcache/xc_opcode_spec.c \
+                  xcache/xc_processor.c \
+                  xcache/xc_sandbox.c \
+                  xcache/xc_shm.c \
+                  xcache/xc_shm_mmap.c \
+                  xcache/xc_utils.c \
                   "
   XCACHE_MODULES="cacher"
   XCACHE_MODULE([optimizer],    [optimizer   ], [XCACHE_OPTIMIZER],    [(N/A)])
@@ -49,7 +49,7 @@ if test "$PHP_XCACHE" != "no"; then
   [  --enable-xcache-test            XCache: Enable self test - FOR DEVELOPERS ONLY!!], no, no)
   if test "$PHP_XCACHE_TEST" != "no"; then
     XCACHE_ENABLE_TEST=-DXCACHE_ENABLE_TEST
-    xcache_sources="$xcache_sources main/xc_malloc.c"
+    xcache_sources="$xcache_sources xcache/xc_malloc.c"
     AC_DEFINE([HAVE_XCACHE_TEST], 1, [Define to enable XCache self test])
   else
     XCACHE_ENABLE_TEST=

config.w32

@@ -12,17 +12,17 @@ if (PHP_XCACHE != "no") {
 	// }}}
 
 	var xcache_sources = "
-	                      main/xc_processor.c \
-	                      main/xc_const_string.c \
-	                      main/xc_lock.c \
-	                      main/xc_mem.c \
-	                      main/xc_opcode_spec.c \
-	                      main/xc_sandbox.c \
-	                      main/xc_shm.c \
-	                      main/xc_shm_mmap.c \
-	                      main/xc_utils.c \
 	                      util/xc_stack.c \
 	                      xcache.c \
+	                      xcache/xc_const_string.c \
+	                      xcache/xc_lock.c \
+	                      xcache/xc_mem.c \
+	                      xcache/xc_opcode_spec.c \
+	                      xcache/xc_processor.c \
+	                      xcache/xc_sandbox.c \
+	                      xcache/xc_shm.c \
+	                      xcache/xc_shm_mmap.c \
+	                      xcache/xc_utils.c \
 	                      ";
 	// {{{ add sources on enabled
 	ARG_ENABLE("xcache-optimizer",    "(N/A)", "no");
@@ -77,7 +77,7 @@ if (PHP_XCACHE != "no") {
 	ARG_ENABLE("xcache-test", "XCache: Enable self test - FOR DEVELOPERS ONLY!!", "no");
 	if (PHP_XCACHE_TEST != "no") {
 		ADD_FLAG("XCACHE_ENABLE_TEST", "-DXCACHE_ENABLE_TEST");
-		xcache_sources += " main/xc_malloc.c";
+		xcache_sources += " xcache/xc_malloc.c";
 		AC_DEFINE("HAVE_XCACHE_TEST", 1, "Define to enable XCache self test");
 	}
 	else {

submodules/xc_disassembler.c

@@ -1,6 +1,7 @@
 #include "xc_disassembler.h"
 #include "xcache.h"
-#include "xc_utils.h"
+#include "xcache/xc_utils.h"
+#include "xcache/xc_sandbox.h"
 #include "xc_processor.h"
 
 static void xc_dasm(zval *output, zend_op_array *op_array TSRMLS_DC) /* {{{ */

xcache.c

@@ -31,10 +31,10 @@
 #include "submodules/xc_disassembler.h"
 #include "xcache_globals.h"
 #include "xc_processor.h"
-#include "xc_const_string.h"
-#include "xc_opcode_spec.h"
-#include "xc_utils.h"
-#include "xc_sandbox.h"
+#include "xcache/xc_const_string.h"
+#include "xcache/xc_opcode_spec.h"
+#include "xcache/xc_utils.h"
+#include "xcache/xc_sandbox.h"
 #include "util/xc_align.h"
 #include "util/xc_stack.h"
 #include "util/xc_vector.h"

xcache.h

@@ -19,8 +19,8 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include "xc_shm.h"
-#include "xc_lock.h"
+#include "xcache/xc_shm.h"
+#include "xcache/xc_lock.h"
 
 #if !defined(ZEND_ENGINE_2_4) && (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 4 || PHP_MAJOR_VERSION > 5)
 #	define ZEND_ENGINE_2_4