diff options
author | njl <njl@FreeBSD.org> | 2003-04-29 19:11:00 +0000 |
---|---|---|
committer | njl <njl@FreeBSD.org> | 2003-04-29 19:11:00 +0000 |
commit | 14d251b203ac4e3fdb3a3b8ab02893103fa6f41c (patch) | |
tree | 82ba80f7bf07ff85aadab03e82360208f291cfc2 /sys/contrib/dev/acpica/acgcc.h | |
parent | 32b2682952c56d1802d387c87c361a5b0e28ae05 (diff) | |
download | FreeBSD-src-14d251b203ac4e3fdb3a3b8ab02893103fa6f41c.zip FreeBSD-src-14d251b203ac4e3fdb3a3b8ab02893103fa6f41c.tar.gz |
Resolve conflicts.
Diffstat (limited to 'sys/contrib/dev/acpica/acgcc.h')
-rw-r--r-- | sys/contrib/dev/acpica/acgcc.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sys/contrib/dev/acpica/acgcc.h b/sys/contrib/dev/acpica/acgcc.h index 90ead14..af60e3a 100644 --- a/sys/contrib/dev/acpica/acgcc.h +++ b/sys/contrib/dev/acpica/acgcc.h @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acgcc.h - GCC specific defines, etc. - * $Revision: 23 $ + * $Revision: 25 $ * *****************************************************************************/ @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp. * All rights reserved. * * 2. License @@ -122,4 +122,11 @@ */ #define ACPI_PRINTF_LIKE_FUNC __attribute__ ((__format__ (__printf__, 4, 5))) +/* Some compilers complain about unused variables. Sometimes we don't want to + * use all the variables (most specifically for _THIS_MODULE). This allow us + * to to tell the compiler warning in a per-variable manner that a variable + * is unused. + */ +#define ACPI_UNUSED_VAR __attribute__ ((unused)) + #endif /* __ACGCC_H__ */ |