ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/utils.C
(Generate patch)

Comparing deliantra/server/common/utils.C (file contents):
Revision 1.71 by root, Fri Feb 1 15:54:07 2008 UTC vs.
Revision 1.72 by root, Tue Apr 1 19:50:36 2008 UTC

… …
469 LOG (llevError, "fork abort: %s\n", msg); 469 LOG (llevError, "fork abort: %s\n", msg);
470} 470}
471 471
472void *salloc_ (int n) throw (std::bad_alloc) 472void *salloc_ (int n) throw (std::bad_alloc)
473{ 473{
474#ifdef PREFER_MALLOC 474#if PREFER_MALLOC
475 void *ptr = malloc (n); 475 void *ptr = malloc (n);
476#else 476#else
477 slice_alloc += n; 477 slice_alloc += n;
478 void *ptr = g_slice_alloc (n); 478 void *ptr = g_slice_alloc (n);
479#endif 479#endif
… …
496 return ptr; 496 return ptr;
497} 497}
498 498
499/******************************************************************************/ 499/******************************************************************************/
500 500
501#ifdef DEBUG_SALLOC 501#if DEBUG_SALLOC
502 502
503#define MAGIC 0xa1b2c35543deadLL 503#define MAGIC 0xa1b2c35543deadLL
504 504
505void *g_slice_alloc (unsigned long size) 505void *g_slice_alloc (unsigned long size)
506{ 506{

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines