From c970ad94ef9c14e231cef601fccccc37300ff210 Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Tue, 23 Mar 2010 21:56:01 +0000 Subject: dahdi: 'clamp' may already be backported. git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@8399 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- include/dahdi/kernel.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h index 42a59d9..22fc3ee 100644 --- a/include/dahdi/kernel.h +++ b/include/dahdi/kernel.h @@ -1186,7 +1186,9 @@ static inline short dahdi_txtone_nextsample(struct dahdi_chan *ss) #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31) #define KERN_CONT "" #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) -#define clamp(x, low, high) min (max (low, x), high) +#ifndef clamp +#define clamp(x, low, high) min(max(low, x), high) +#endif #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25) /* Some distributions backported fatal_signal_pending so we'll use a macro to -- cgit v1.2.3