Changeset 1006

Timestamp:

07/19/2012 05:11:16 PM (10 months ago)

Author:

moo

Message:

fix win32 build

Location:

trunk

Files:

• config.m4 (modified) (1 diff)
• config.w32 (modified) (5 diffs)
• devel/run (modified) (1 diff)
• mod_cacher/htdocs (modified) (1 prop)
• mod_coverager/htdocs (modified) (1 prop)
• mod_coverager/xc_coverager.c (modified) (1 diff)
• util/xc_trace.h (modified) (1 diff)
• xcache/xc_utils.h (modified) (1 diff)

trunk/config.m4

@@ -24 +24 @@
   fi
 
-  xcache_sources=" \
-util/xc_stack.c \
-util/xc_trace.c \
-xcache.c \
-xcache/xc_const_string.c \
-xcache/xc_compatibility.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_sources="xcache.c"
+  for i in \
+xc_stack.c \
+xc_trace.c \
+; do
+  xcache_sources="$xcache_sources util/$i"
+done
+  for i in \
+xc_const_string.c \
+xc_compatibility.c \
+xc_lock.c \
+xc_mem.c \
+xc_opcode_spec.c \
+xc_processor.c \
+xc_sandbox.c \
+xc_shm.c \
+xc_shm_mmap.c \
+xc_utils.c \
+; do
+  xcache_sources="$xcache_sources xcache/$i"
+done
   XCACHE_MODULES="cacher"
   XCACHE_MODULE([optimizer],    [optimizer   ], [XCACHE_OPTIMIZER],    [(N/A)])

trunk/config.w32

@@ -5 +5 @@
 
 if (PHP_XCACHE != "no") {
+    EXTENSION("xcache", "xcache.c", null, "/I " + configure_module_dirname);
     // {{{ check for xcache-constant 
     ARG_ENABLE("xcache-constant", "XCache: Handle new constants made by php compiler (e.g.: for __halt_compiler)", "yes");
@@ -12 +13 @@
     // }}}
 
-    var xcache_sources = " \
-util/xc_stack.c \
-util/xc_trace.c \
-xcache.c \
-xcache/xc_const_string.c \
-xcache/xc_compatibility.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(configure_module_dirname + "/util", " \
+xc_stack.c \
+xc_trace.c \
+", "xcache");
+
+    ADD_SOURCES(configure_module_dirname + "/xcache", " \
+xc_const_string.c \
+xc_compatibility.c \
+xc_lock.c \
+xc_mem.c \
+xc_opcode_spec.c \
+xc_processor.c \
+xc_sandbox.c \
+xc_shm.c \
+xc_shm_mmap.c \
+xc_utils.c \
+", "xcache");
+
     // {{{ add sources on enabled
     ARG_ENABLE("xcache-optimizer",    "(N/A)", "no");
@@ -45 +49 @@
         var withval = eval("PHP_XCACHE_" + uname);
         if (withval != "no") {
-            xcache_sources += " mod_" + name + "/xc_" + name + ".c";
+            ADD_SOURCES(configure_module_dirname + "/mod_" + name, "xc_" + name + ".c", "xcache");
             XCACHE_MODULES += " " + name;
             STDOUT.WriteLine("Enabling XCache Module: " + name);
@@ -80 +84 @@
     if (PHP_XCACHE_TEST != "no") {
         ADD_FLAG("XCACHE_ENABLE_TEST", "-DXCACHE_ENABLE_TEST");
-        xcache_sources += " xcache/xc_malloc.c";
+        ADD_SOURCES(configure_module_dirname + "/xcache", "xc_malloc.c", "xcache");
         AC_DEFINE("HAVE_XCACHE_TEST", 1, "Define to enable XCache self test");
     }
@@ -93 +97 @@
     }
     // }}}
-    // {{{ create extension
-    EXTENSION("xcache", xcache_sources);
+    // {{{ get ccrule
     var srcdir = configure_module_dirname;
     // it's a bit harder to get builddir

trunk/devel/run

@@ -87 +87 @@
         --enable-xcache-decoder \
         --enable-xcache-disassembler \
+        --enable-xcache-coverager \
         --enable-xcache-test --enable-xcache-constant \
     && make clean all

trunk/mod_coverager/xc_coverager.c

@@ -13 +13 @@
 #include <fcntl.h>
 
-#include "stack.h"
+#include "util/xc_stack.h"
+#include "util/xc_trace.h"
 #include "xcache_globals.h"
-#include "coverager.h"
-#include "utils.h"
+#include "xc_coverager.h"
+#include "xcache/xc_utils.h"
+
 typedef HashTable *coverager_t;
 #define PCOV_HEADER_MAGIC 0x564f4350

trunk/util/xc_trace.h

@@ -5 +5 @@
 #pragma once
 #endif // _MSC_VER > 1000
+
+#ifdef ZEND_WIN32
+#   ifndef inline
+#       ifdef ZEND_WIN32_FORCE_INLINE
+#           define inline __forceinline
+#       else
+#           define inline
+#       endif
+#   endif
+#endif
 
 #ifdef XCACHE_DEBUG

trunk/xcache/xc_utils.h

@@ -1 +1 @@
 #include "php.h"
-#include "xcache.h"
+#include "../xcache.h"
 
 typedef struct {