PennMUSH Community

Changeset 839

Show
Ignore:
Timestamp:
05/15/07 11:16:35 (2 years ago)
Author:
shawnw
Message:

#7311: Removed gmalloc

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • 1.8.2/branches/devel/CHANGES.182

    r816 r839  
    1414 
    1515========================================================================== 
     16 
     17Version 1.8.2 patchlevel 5                      ??? ??, 2007 
     18 
     19Minor changes: 
     20  * Removed the gmalloc malloc option. [SW] 
    1621 
    1722Version 1.8.2 patchlevel 4                      May ??, 2007 
  • 1.8.2/branches/devel/hdrs/mymalloc.h

    r427 r839  
    55#ifndef _MYMALLOC_H 
    66#define _MYMALLOC_H 
    7  
    8 #ifdef WIN32 
    9 #undef malloc 
    10 #undef calloc 
    11 #undef realloc 
    12 #undef free 
    13 #endif 
    14  
    15 /* If you're using gmalloc on some linux kernels, and have trouble 
    16  * with the compile, consider uncommenting this line: */ 
    17 /*#undef I_MALLOC */ 
    18 #ifdef I_MALLOC 
    19 #include <malloc.h> 
    20 #endif 
    217 
    228#include "options.h" 
  • 1.8.2/branches/devel/options.h.dist

    r523 r839  
    3535 *       Recommended for FreeBSD, Linux, Mac OS X/Darwin, and other OS's 
    3636 *       where you think the malloc routines are efficient and debugged. 
    37  *       Otherwise, use only as a last resort
    38  *  1 -- Use the CSRI malloc package in normal mode.  
    39  *       Recommended for most operating systems where system malloc is 
    40  *       suspect. Known to work well on SunOS 4.1.x. 
     37 *       In other words, pretty much any fairly current OS releases
     38 *  1 -- Use the CSRI malloc package in normal mode. 
     39 *       Recomended for ancient OS releases. On anything modern, you'll want 
     40 *       the system malloc (Option 0).  
    4141 *  2 -- Use the CSRI malloc package in debug mode.  
    4242 *       Only use this if you're tracking down memory leaks. Don't use 
    4343 *       for a production MUSH - it's slow. 
    44  *  5 -- Use the GNU malloc (gmalloc) package.  
    45  *       Doesn't work on Alpha processors or FreeBSD systems, and 
    46  *       reportedly flaky on Linux. Requires an ANSI compiler. 
    47  *       Otherwise, similar to CSRI malloc. 
    48  *  3, 4, 6 -- Same as 0, kept for compatibility.  
     44 *  3, 4, 5, 6 -- Same as 0, kept for compatibility.  
    4945 */ 
    5046#define MALLOC_PACKAGE 0 
  • 1.8.2/branches/devel/src/mymalloc.c

    r423 r839  
    2020#elif (MALLOC_PACKAGE == 2) 
    2121#include "csrimalloc.c" 
    22 #elif (MALLOC_PACKAGE == 5) 
    23 #include "gmalloc.c" 
    2422#endif