diff options
Diffstat (limited to 'cvmx-warn.h')
-rw-r--r-- | cvmx-warn.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/cvmx-warn.h b/cvmx-warn.h index 264a613701f1..5223cac411e3 100644 --- a/cvmx-warn.h +++ b/cvmx-warn.h @@ -1,5 +1,5 @@ /***********************license start*************** - * Copyright (c) 2003-2010 Cavium Networks (support@cavium.com). All rights + * Copyright (c) 2003-2010 Cavium Inc. (support@cavium.com). All rights * reserved. * * @@ -15,7 +15,7 @@ * disclaimer in the documentation and/or other materials provided * with the distribution. - * * Neither the name of Cavium Networks nor the names of + * * Neither the name of Cavium Inc. nor the names of * its contributors may be used to endorse or promote products * derived from this software without specific prior written * permission. @@ -26,7 +26,7 @@ * countries. * TO THE MAXIMUM EXTENT PERMITTED BY LAW, THE SOFTWARE IS PROVIDED "AS IS" - * AND WITH ALL FAULTS AND CAVIUM NETWORKS MAKES NO PROMISES, REPRESENTATIONS OR + * AND WITH ALL FAULTS AND CAVIUM INC. MAKES NO PROMISES, REPRESENTATIONS OR * WARRANTIES, EITHER EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE, WITH RESPECT TO * THE SOFTWARE, INCLUDING ITS CONDITION, ITS CONFORMITY TO ANY REPRESENTATION OR * DESCRIPTION, OR THE EXISTENCE OF ANY LATENT OR PATENT DEFECTS, AND CAVIUM @@ -48,7 +48,7 @@ * * Functions for warning users about errors and such. * - * <hr>$Revision: 49448 $<hr> + * <hr>$Revision: 70030 $<hr> * */ #ifndef __CVMX_WARN_H__ @@ -58,11 +58,13 @@ extern "C" { #endif +#ifndef cvmx_warn #ifdef printf extern void cvmx_warn(const char *format, ...); #else extern void cvmx_warn(const char *format, ...) __attribute__ ((format(printf, 1, 2))); #endif +#endif #define cvmx_warn_if(expression, format, ...) if (expression) cvmx_warn(format, ##__VA_ARGS__) |