diff options
| author | Robert Moore <Robert.Moore@intel.com> | 2016-06-15 10:51:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-15 10:51:12 -0700 |
| commit | d776c9ee6e67f3b7a186d809763558ca7a358710 (patch) | |
| tree | 22aee76d7f384a2553421abf763747a229bf0680 /source/tools/acpiexec/aemain.c | |
| parent | 8aac0be3c840747a032b63e7365c99190e2a0ba9 (diff) | |
| download | acpica-d776c9ee6e67f3b7a186d809763558ca7a358710.tar.gz | |
Revert "Efi edk2"revert-143-efi-edk2
Diffstat (limited to 'source/tools/acpiexec/aemain.c')
| -rw-r--r-- | source/tools/acpiexec/aemain.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/source/tools/acpiexec/aemain.c b/source/tools/acpiexec/aemain.c index b153121fe..a645ffa27 100644 --- a/source/tools/acpiexec/aemain.c +++ b/source/tools/acpiexec/aemain.c @@ -114,6 +114,7 @@ *****************************************************************************/ #include "aecommon.h" +#include "errno.h" #define _COMPONENT ACPI_TOOLS ACPI_MODULE_NAME ("aemain") @@ -130,6 +131,7 @@ * Windows: The setargv.obj module must be linked in to automatically * expand wildcards. */ +extern BOOLEAN AcpiGbl_DebugTimeout; /* Local prototypes */ @@ -396,12 +398,10 @@ AeDoOptions ( return (-1); } -#ifndef ACPI_DISABLE_OBJECT_OVERRIDE if (AeOpenInitializationFile (AcpiGbl_Optarg)) { return (-1); } -#endif break; default: @@ -519,17 +519,10 @@ AeDoOptions ( * *****************************************************************************/ -#ifndef _GNU_EFI int ACPI_SYSTEM_XFACE main ( int argc, - char *argv[]) -#else -int ACPI_SYSTEM_XFACE -acpi_main ( - int argc, - char *argv[]) -#endif + char **argv) { ACPI_NEW_TABLE_DESC *ListHead = NULL; ACPI_STATUS Status; @@ -538,9 +531,7 @@ acpi_main ( ACPI_DEBUG_INITIALIZE (); /* For debug version only */ -#ifndef _GNU_EFI signal (SIGINT, AeCtrlCHandler); -#endif /* Init debug globals */ |