From d5e2fc21510aa0c57a7c420498b212bbc00d78ac Mon Sep 17 00:00:00 2001 From: sruffell Date: Mon, 5 Jan 2009 22:48:29 +0000 Subject: Even on older kernels, do not redefine WARN_ON_ONCE if it is already defined. git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@4609 5390a7c7-147a-4af0-8ec9-7488f05a26cb --- kernel/wctc4xxp/base.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/wctc4xxp/base.c b/kernel/wctc4xxp/base.c index 8946940..256e0fb 100644 --- a/kernel/wctc4xxp/base.c +++ b/kernel/wctc4xxp/base.c @@ -73,6 +73,7 @@ } \ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) +#ifndef WARN_ON_ONCE #define WARN_ON_ONCE(__condition) do { \ static int __once = 1; \ if (unlikely(__condition)) { \ @@ -83,6 +84,7 @@ } \ } while(0) #endif +#endif #define INVALID 999 /* Used to mark invalid channels, commands, etc.. */ #define MAX_CHANNEL_PACKETS 5 /* Never let more than 5 outstanding packets exist for any channel. */ -- cgit v1.2.3