summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsruffell <sruffell@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2009-01-05 22:48:29 +0000
committersruffell <sruffell@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2009-01-05 22:48:29 +0000
commitd5e2fc21510aa0c57a7c420498b212bbc00d78ac (patch)
treefd3b3348fcf308a45d29402371b8e8da64f69982
parentffbc20d66373a2469b34e4fbd529d21f18520c02 (diff)
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
-rw-r--r--kernel/wctc4xxp/base.c2
1 files changed, 2 insertions, 0 deletions
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. */