From f76fe23e11110422e98f7c3660dca81dd509e979 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Tue, 6 Mar 2007 22:01:03 +0000
Subject: 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)

---
 source3/lib/util.c | 15 ---------------
 1 file changed, 15 deletions(-)

(limited to 'source3/lib/util.c')

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
@@ -912,17 +912,6 @@ void *malloc_(size_t size)
 #define malloc(s) __ERROR_DONT_USE_MALLOC_DIRECTLY
 }
 
-/****************************************************************************
- 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
 }
 
 /****************************************************************************
-- 
cgit