Changeset 987 for trunk/config.w32

Timestamp:

2012-07-18T05:19:57+02:00 (11 months ago)

Author:

moo

Message:

main/ conflict with php/main/

File:

• trunk/config.w32 (modified) (2 diffs)

trunk/config.w32

@@ -13 +13 @@
 
     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
@@ -78 +78 @@
     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");
     }