frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hw/xfree86: Support ACPI without APM. 

On systems with ACPI but disabled APM (e.g. --disable-linux-apm)
the code does not compile due to preprocessor directives.

If APM is disabled, the final return statement is considered to
be part of ACPI's last if-statement, leading to a function which
has no final return statement at all.

I have refactored the code so ACPI and APM are independent of each
other.

Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
This commit is contained in:
Tobias Stoeckmann 2020-04-19 15:29:43 +02:00 committed by Adam Jackson
parent 785e59060c
commit 9890e91265
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/xfree86/os-support/linux/lnx_apm.c
View File

@ -138,13 +138,14 @@ xf86OSPMOpen(void)
#ifdef HAVE_ACPI #ifdef HAVE_ACPI
/* Favour ACPI over APM, but only when enabled */ /* Favour ACPI over APM, but only when enabled */
if (!xf86acpiDisableFlag) if (!xf86acpiDisableFlag) {
ret = lnxACPIOpen(); ret = lnxACPIOpen();
if (ret)
if (!ret) return ret;
}
#endif #endif
#ifdef HAVE_APM #ifdef HAVE_APM
ret = lnxAPMOpen(); ret = lnxAPMOpen();
#endif #endif
return ret; return ret;