diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-27 18:11:38 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-27 18:11:38 +0200 |
| commit | c9b77a4070a60762aee048e3c353d72fb990f940 (patch) | |
| tree | 7820cae684404d2bd26814a327f0e2809724dd33 /include/acpi/platform/acgcc.h | |
| parent | 85dbd5801f62b66e2aa7826aaefcaebead44c8a6 (diff) | |
| parent | bc381eebd4b246d6cc29d97ab34d2c54ecc40a87 (diff) | |
Merge back earlier ACPICA material.
Conflicts:
drivers/acpi/acpica/acglobal.h
Diffstat (limited to 'include/acpi/platform/acgcc.h')
| -rw-r--r-- | include/acpi/platform/acgcc.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/acpi/platform/acgcc.h b/include/acpi/platform/acgcc.h index a476b9118b49..384875da3713 100644 --- a/include/acpi/platform/acgcc.h +++ b/include/acpi/platform/acgcc.h @@ -64,4 +64,15 @@ */ #define ACPI_UNUSED_VAR __attribute__ ((unused)) +/* + * Some versions of gcc implement strchr() with a buggy macro. So, + * undef it here. Prevents error messages of this form (usually from the + * file getopt.c): + * + * error: logical '&&' with non-zero constant will always evaluate as true + */ +#ifdef strchr +#undef strchr +#endif + #endif /* __ACGCC_H__ */ |