… | … | ||
---|---|---|---|
570 | LOG (llevError, "fork abort: %s\n", msg); | 570 | LOG (llevError, "fork abort: %s\n", msg); |
571 | } | 571 | } |
572 | 572 | ||
573 | void *salloc_ (int n) throw (std::bad_alloc) | 573 | void *salloc_ (int n) throw (std::bad_alloc) |
574 | { | 574 | { |
575 | #ifdef PREFER_MALLOC | ||
576 | void *ptr = malloc (n); | ||
577 | #else | ||
575 | void *ptr = g_slice_alloc (n); | 578 | void *ptr = g_slice_alloc (n); |
579 | #endif | ||
576 | 580 | ||
577 | if (!ptr) | 581 | if (!ptr) |
578 | throw std::bad_alloc (); | 582 | throw std::bad_alloc (); |
579 | 583 | ||
580 | return ptr; | 584 | return ptr; |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |