diff options
| author | Lv Zheng <lv.zheng@intel.com> | 2015-01-27 09:48:10 +0800 |
|---|---|---|
| committer | Lv Zheng <lv.zheng@intel.com> | 2015-01-27 09:48:10 +0800 |
| commit | 9a5982afbebc56289c4834b5f6dac87e0f04af14 (patch) | |
| tree | 0df8be8e63c58c203e5f4573dd6c38d0348965b0 /source/include/acutils.h | |
| parent | 6eb364d790dd103bd4990f808e0095a421c437cb (diff) | |
| download | acpica-9a5982afbebc56289c4834b5f6dac87e0f04af14.tar.gz | |
Utilities: Correct conditional compilation definitions.
Some conditional compilation definitions are wrong across header and source
files. This patch corrects them for the utilities component.
Reported-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Diffstat (limited to 'source/include/acutils.h')
| -rw-r--r-- | source/include/acutils.h | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/source/include/acutils.h b/source/include/acutils.h index 8a703da11..e537f5cbb 100644 --- a/source/include/acutils.h +++ b/source/include/acutils.h @@ -795,6 +795,12 @@ const ACPI_PREDEFINED_INFO * AcpiUtMatchPredefinedMethod ( char *Name); +void +AcpiUtGetExpectedReturnTypes ( + char *Buffer, + UINT32 ExpectedBtypes); + +#if (defined ACPI_ASL_COMPILER || defined ACPI_HELP_APP) const ACPI_PREDEFINED_INFO * AcpiUtMatchResourceName ( char *Name); @@ -805,15 +811,11 @@ AcpiUtDisplayPredefinedMethod ( const ACPI_PREDEFINED_INFO *ThisName, BOOLEAN MultiLine); -void -AcpiUtGetExpectedReturnTypes ( - char *Buffer, - UINT32 ExpectedBtypes); - UINT32 AcpiUtGetResourceBitWidth ( char *Buffer, UINT16 Types); +#endif /* @@ -892,9 +894,11 @@ BOOLEAN AcpiUtIsPciRootBridge ( char *Id); +#if (defined ACPI_ASL_COMPILER || defined ACPI_EXEC_APP) BOOLEAN AcpiUtIsAmlTable ( ACPI_TABLE_HEADER *Table); +#endif ACPI_STATUS AcpiUtWalkPackageTree ( @@ -983,6 +987,7 @@ void AcpiUtStrupr ( char *SrcString); +#ifdef ACPI_ASL_COMPILER void AcpiUtStrlwr ( char *SrcString); @@ -991,6 +996,7 @@ int AcpiUtStricmp ( char *String1, char *String2); +#endif ACPI_STATUS AcpiUtStrtoul64 ( @@ -1003,9 +1009,11 @@ AcpiUtPrintString ( char *String, UINT16 MaxLength); +#if defined ACPI_ASL_COMPILER || defined ACPI_EXEC_APP void UtConvertBackslashes ( char *Pathname); +#endif BOOLEAN AcpiUtValidAcpiName ( @@ -1252,9 +1260,11 @@ AcpiUtFilePrintf ( /* * utuuid -- UUID support functions */ +#if (defined ACPI_ASL_COMPILER || defined ACPI_EXEC_APP || defined ACPI_HELP_APP) void AcpiUtConvertStringToUuid ( char *InString, UINT8 *UuidBuffer); +#endif #endif /* _ACUTILS_H */ |