Changeset 1006 in svn


Ignore:
Timestamp:
2012-07-19T15:11:16Z (3 years ago)
Author:
Xuefer
Message:

fix win32 build

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/config.m4

    r1004 r1006  
    2424  fi
    2525
    26   xcache_sources=" \
    27 util/xc_stack.c \
    28 util/xc_trace.c \
    29 xcache.c \
    30 xcache/xc_const_string.c \
    31 xcache/xc_compatibility.c \
    32 xcache/xc_lock.c \
    33 xcache/xc_mem.c \
    34 xcache/xc_opcode_spec.c \
    35 xcache/xc_processor.c \
    36 xcache/xc_sandbox.c \
    37 xcache/xc_shm.c \
    38 xcache/xc_shm_mmap.c \
    39 xcache/xc_utils.c \
    40 "
     26  xcache_sources="xcache.c"
     27  for i in \
     28xc_stack.c \
     29xc_trace.c \
     30; do
     31  xcache_sources="$xcache_sources util/$i"
     32done
     33  for i in \
     34xc_const_string.c \
     35xc_compatibility.c \
     36xc_lock.c \
     37xc_mem.c \
     38xc_opcode_spec.c \
     39xc_processor.c \
     40xc_sandbox.c \
     41xc_shm.c \
     42xc_shm_mmap.c \
     43xc_utils.c \
     44; do
     45  xcache_sources="$xcache_sources xcache/$i"
     46done
    4147  XCACHE_MODULES="cacher"
    4248  XCACHE_MODULE([optimizer],    [optimizer   ], [XCACHE_OPTIMIZER],    [(N/A)])
  • trunk/config.w32

    r1004 r1006  
    55
    66if (PHP_XCACHE != "no") {
     7    EXTENSION("xcache", "xcache.c", null, "/I " + configure_module_dirname);
    78    // {{{ check for xcache-constant
    89    ARG_ENABLE("xcache-constant", "XCache: Handle new constants made by php compiler (e.g.: for __halt_compiler)", "yes");
     
    1213    // }}}
    1314
    14     var xcache_sources = " \
    15 util/xc_stack.c \
    16 util/xc_trace.c \
    17 xcache.c \
    18 xcache/xc_const_string.c \
    19 xcache/xc_compatibility.c \
    20 xcache/xc_lock.c \
    21 xcache/xc_mem.c \
    22 xcache/xc_opcode_spec.c \
    23 xcache/xc_processor.c \
    24 xcache/xc_sandbox.c \
    25 xcache/xc_shm.c \
    26 xcache/xc_shm_mmap.c \
    27 xcache/xc_utils.c \
    28 ";
     15    ADD_SOURCES(configure_module_dirname + "/util", " \
     16xc_stack.c \
     17xc_trace.c \
     18", "xcache");
     19
     20    ADD_SOURCES(configure_module_dirname + "/xcache", " \
     21xc_const_string.c \
     22xc_compatibility.c \
     23xc_lock.c \
     24xc_mem.c \
     25xc_opcode_spec.c \
     26xc_processor.c \
     27xc_sandbox.c \
     28xc_shm.c \
     29xc_shm_mmap.c \
     30xc_utils.c \
     31", "xcache");
     32
    2933    // {{{ add sources on enabled
    3034    ARG_ENABLE("xcache-optimizer",    "(N/A)", "no");
     
    4549        var withval = eval("PHP_XCACHE_" + uname);
    4650        if (withval != "no") {
    47             xcache_sources += " mod_" + name + "/xc_" + name + ".c";
     51            ADD_SOURCES(configure_module_dirname + "/mod_" + name, "xc_" + name + ".c", "xcache");
    4852            XCACHE_MODULES += " " + name;
    4953            STDOUT.WriteLine("Enabling XCache Module: " + name);
     
    8084    if (PHP_XCACHE_TEST != "no") {
    8185        ADD_FLAG("XCACHE_ENABLE_TEST", "-DXCACHE_ENABLE_TEST");
    82         xcache_sources += " xcache/xc_malloc.c";
     86        ADD_SOURCES(configure_module_dirname + "/xcache", "xc_malloc.c", "xcache");
    8387        AC_DEFINE("HAVE_XCACHE_TEST", 1, "Define to enable XCache self test");
    8488    }
     
    9397    }
    9498    // }}}
    95     // {{{ create extension
    96     EXTENSION("xcache", xcache_sources);
     99    // {{{ get ccrule
    97100    var srcdir = configure_module_dirname;
    98101    // it's a bit harder to get builddir
  • trunk/devel/run

    r1003 r1006  
    8787        --enable-xcache-decoder \
    8888        --enable-xcache-disassembler \
     89        --enable-xcache-coverager \
    8990        --enable-xcache-test --enable-xcache-constant \
    9091    && make clean all
  • trunk/mod_cacher/htdocs

    • Property svn:ignore set to
      config.php
  • trunk/mod_coverager/htdocs

    • Property svn:ignore set to
      config.php
  • trunk/mod_coverager/xc_coverager.c

    r1003 r1006  
    1313#include <fcntl.h>
    1414
    15 #include "stack.h"
     15#include "util/xc_stack.h"
     16#include "util/xc_trace.h"
    1617#include "xcache_globals.h"
    17 #include "coverager.h"
    18 #include "utils.h"
     18#include "xc_coverager.h"
     19#include "xcache/xc_utils.h"
     20
    1921typedef HashTable *coverager_t;
    2022#define PCOV_HEADER_MAGIC 0x564f4350
  • trunk/util/xc_trace.h

    r984 r1006  
    55#pragma once
    66#endif // _MSC_VER > 1000
     7
     8#ifdef ZEND_WIN32
     9#   ifndef inline
     10#       ifdef ZEND_WIN32_FORCE_INLINE
     11#           define inline __forceinline
     12#       else
     13#           define inline
     14#       endif
     15#   endif
     16#endif
    717
    818#ifdef XCACHE_DEBUG
  • trunk/xcache/xc_utils.h

    r996 r1006  
    11#include "php.h"
    2 #include "xcache.h"
     2#include "../xcache.h"
    33
    44typedef struct {
Note: See TracChangeset for help on using the changeset viewer.