[svn-commits] sruffell: linux/trunk r8399 - /linux/trunk/include/dahdi/kernel.h

[SVN commits to the Digium repositories]

Author: sruffell
Date: Tue Mar 23 16:56:01 2010
New Revision: 8399

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=8399
Log:
dahdi: 'clamp' may already be backported.

Modified:
    linux/trunk/include/dahdi/kernel.h

Modified: linux/trunk/include/dahdi/kernel.h
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/include/dahdi/kernel.h?view=diff&rev=8399&r1=8398&r2=8399
==============================================================================
--- linux/trunk/include/dahdi/kernel.h (original)
+++ linux/trunk/include/dahdi/kernel.h Tue Mar 23 16:56:01 2010
@@ -1186,7 +1186,9 @@
 #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