Changeset 466 in svn for branches/1.2

Timestamp:

2007-08-05T02:37:02Z (10 years ago)

Author:

Xuefer

Message:

support shm-malloc only on --enable-xcache-test

Location:

branches/1.2

Files:

• config.m4 (modified) (2 diffs)
• config.w32 (modified) (2 diffs)
• xc_shm.c (modified) (1 diff)

branches/1.2/config.m4

@@ -28 +28 @@
                   mmap.c \
                   mem.c \
-                  xc_malloc.c \
                   xc_shm.c \
                   const_string.c \
@@ -52 +51 @@
   if test "$PHP_XCACHE_TEST" != "no"; then
     XCACHE_ENABLE_TEST=-DXCACHE_ENABLE_TEST
+    xcache_sources="$xcache_sources xc_malloc.c"
     AC_DEFINE([HAVE_XCACHE_TEST], 1, [Define to enable XCache self test])
   else

branches/1.2/config.w32

@@ -16 +16 @@
                           mmap.c \
                           mem.c \
-                          xc_malloc.c \
                           xc_shm.c \
                           const_string.c \
@@ -114 +113 @@
     if (PHP_XCACHE_TEST != "no") {
         ADD_FLAG("XCACHE_ENABLE_TEST", "-DXCACHE_ENABLE_TEST");
+        xcache_sources += " xc_malloc.c";
         AC_DEFINE("HAVE_XCACHE_TEST", 1, "Define to enable XCache self test");
     }

branches/1.2/xc_shm.c

@@ -20 +20 @@
 {
     extern void xc_shm_mem_init();
+#ifdef HAVE_XCACHE_TEST
     extern void xc_shm_malloc_register();
+#endif
     extern void xc_shm_mmap_register();
 
     memset(xc_shm_schemes, 0, sizeof(xc_shm_schemes));
     xc_shm_mem_init();
+#ifdef HAVE_XCACHE_TEST
     xc_shm_malloc_register();
+#endif
     xc_shm_mmap_register();
 }