Changeset 479 in svn for branches/1.2


Ignore:
Timestamp:
2007-09-17T12:46:33+02:00 (8 years ago)
Author:
Xuefer
Message:

scheme=malloc was broken in [465]

Location:
branches/1.2
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/1.2

    • Property svnmerge-integrated changed
      /trunkmerged: 478
  • branches/1.2/config.m4

    r466 r479  
    4444  AC_DEFINE_UNQUOTED([XCACHE_MODULES], "$XCACHE_MODULES", [Define what modules is built with XCache])
    4545
    46   PHP_NEW_EXTENSION(xcache, $xcache_sources, $ext_shared)
    47   PHP_ADD_MAKEFILE_FRAGMENT()
    48 
    4946  PHP_ARG_ENABLE(xcache-test, for XCache self test,
    5047  [  --enable-xcache-test            XCache: Enable self test - FOR DEVELOPERS ONLY!!], no, no)
     
    6360    AC_DEFINE([HAVE_XCACHE_DPRINT], 1, [Define to enable XCache debug print functions])
    6461  fi
     62
     63  PHP_NEW_EXTENSION(xcache, $xcache_sources, $ext_shared)
     64  PHP_ADD_MAKEFILE_FRAGMENT()
    6565
    6666  AC_PATH_PROGS([XCACHE_AWK], [gawk awk])
  • branches/1.2/config.w32

    r466 r479  
    7171    DEFINE("XCACHE_INDENT", indent);
    7272    // }}}
     73    // {{{ check for xcache-test
     74    ARG_ENABLE("xcache-test", "XCache: Enable self test - FOR DEVELOPERS ONLY!!", "no");
     75    if (PHP_XCACHE_TEST != "no") {
     76        ADD_FLAG("XCACHE_ENABLE_TEST", "-DXCACHE_ENABLE_TEST");
     77        xcache_sources += " xc_malloc.c";
     78        AC_DEFINE("HAVE_XCACHE_TEST", 1, "Define to enable XCache self test");
     79    }
     80    else {
     81        ADD_FLAG("XCACHE_ENABLE_TEST", "");
     82    }
     83    // }}}
     84    // {{{ check for xcache-test
     85    ARG_ENABLE("xcache-dprint", "XCache: Enable self debug print functions - FOR DEVELOPERS ONLY!!", "no");
     86    if (PHP_XCACHE_DPRINT != "no") {
     87        AC_DEFINE("HAVE_XCACHE_DPRINT", 1, "Define to enable XCache debug print functions");
     88    }
     89    // }}}
    7390    // {{{ create extension
    7491    EXTENSION("xcache", xcache_sources);
     
    109126    ADD_FLAG("CFLAGS_XCACHE", "/I " + builddir);
    110127    /// }}}
    111     // {{{ check for xcache-test
    112     ARG_ENABLE("xcache-test", "XCache: Enable self test - FOR DEVELOPERS ONLY!!", "no");
    113     if (PHP_XCACHE_TEST != "no") {
    114         ADD_FLAG("XCACHE_ENABLE_TEST", "-DXCACHE_ENABLE_TEST");
    115         xcache_sources += " xc_malloc.c";
    116         AC_DEFINE("HAVE_XCACHE_TEST", 1, "Define to enable XCache self test");
    117     }
    118     else {
    119         ADD_FLAG("XCACHE_ENABLE_TEST", "");
    120     }
    121     // }}}
    122128    XCACHE_PROC_SOURCES=glob(srcdir + "\\processor\\*.m4").join(' ');
    123129    ADD_FLAG("XCACHE_PROC_SOURCES", XCACHE_PROC_SOURCES);
    124     // {{{ check for xcache-test
    125     ARG_ENABLE("xcache-dprint", "XCache: Enable self debug print functions - FOR DEVELOPERS ONLY!!", "no");
    126     if (PHP_XCACHE_TEST != "no") {
    127         AC_DEFINE("HAVE_XCACHE_TEST", 1, "Define to enable XCache debug print functions");
    128     }
    129     // }}}
    130130    // {{{ check for opcode_spec_def.h
    131131    STDOUT.Write("Checking if you have opcode_spec_def.h for XCache ... ");
  • branches/1.2/xc_malloc.c

    r392 r479  
    44#include <stdio.h>
    55#include <string.h>
     6
     7#ifdef HAVE_CONFIG_H
     8#include <config.h>
     9#endif
    610#include "xc_shm.h"
    711#include "php.h"
  • branches/1.2/xc_shm.c

    r466 r479  
    99#include <stdlib.h>
    1010#include <string.h>
     11
     12#ifdef HAVE_CONFIG_H
     13#include <config.h>
     14#endif
    1115#include "xc_shm.h"
    1216
Note: See TracChangeset for help on using the changeset viewer.