[svn-commits] sruffell: branch 1.4 r4609 - /branches/1.4/kernel/wctc4xxp/base.c

[SVN commits to the Digium repositories]

Author: sruffell
Date: Mon Jan  5 16:48:29 2009
New Revision: 4609

URL: http://svn.digium.com/view/zaptel?view=rev&rev=4609
Log:
Even on older kernels, do not redefine WARN_ON_ONCE if it is already defined.

Modified:
    branches/1.4/kernel/wctc4xxp/base.c

Modified: branches/1.4/kernel/wctc4xxp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/wctc4xxp/base.c?view=diff&rev=4609&r1=4608&r2=4609
==============================================================================
--- branches/1.4/kernel/wctc4xxp/base.c (original)
+++ branches/1.4/kernel/wctc4xxp/base.c Mon Jan  5 16:48:29 2009
@@ -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)) {           \
@@ -82,6 +83,7 @@
 		}                              \
 	}                                      \
 } while(0) 
+#endif
 #endif
 
 #define INVALID 999 /* Used to mark invalid channels, commands, etc.. */