diff options
| author | Jeremy Allison <jra@samba.org> | 2007-03-06 22:01:03 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:18:26 -0500 |
| commit | f76fe23e11110422e98f7c3660dca81dd509e979 (patch) | |
| tree | 2290d62d0bba69ae515d116cce2b75ba89544cf1 /source3/lib/util.c | |
| parent | 640ab28d78dac5c2bcee8b641c8971fcbcd87dfa (diff) | |
| download | samba-f76fe23e11110422e98f7c3660dca81dd509e979.tar.gz samba-f76fe23e11110422e98f7c3660dca81dd509e979.tar.bz2 samba-f76fe23e11110422e98f7c3660dca81dd509e979.zip | |
r21725: Fix for memalign used without test guards. Was
breaking the build on *BSD's. Tested by Herb.
Jeremy.
(This used to be commit 4816af5ce9070385b292f666779a24057b39e457)
Diffstat (limited to 'source3/lib/util.c')
| -rw-r--r-- | source3/lib/util.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/source3/lib/util.c b/source3/lib/util.c index 67c9c8d37a..b29f459c02 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -913,17 +913,6 @@ void *malloc_(size_t size) } /**************************************************************************** - Internal malloc wrapper. Externally visible. -****************************************************************************/ - -void *memalign_(size_t align, size_t size) -{ -#undef memalign - return memalign(align, size); -#define memalign(align, s) __ERROR_DONT_USE_MEMALIGN_DIRECTLY -} - -/**************************************************************************** Internal calloc wrapper. Not externally visible. ****************************************************************************/ @@ -974,11 +963,7 @@ void *memalign_array(size_t el_size, size_t align, unsigned int count) return NULL; } -#if defined(PARANOID_MALLOC_CHECKER) - return memalign_(align, el_size*count); -#else return sys_memalign(align, el_size*count); -#endif } /**************************************************************************** |