1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25

Fix build of the Solaris APM os-support file: include xf86_priv.h.

XLibre moved the power-management hook declarations
    extern int (*xf86PMGetEventFromOs)(...);
    extern pmWait (*xf86PMConfirmEventToOs)(...);
    void xf86HandlePMEvents(int fd, void *data);
into hw/xfree86/common/xf86_priv.h (lowercase-underscore), and updated the
Linux backend (lnx_apm.c / lnx_acpi.c include "xf86_priv.h") but NOT the
Solaris backend. hw/xfree86/os-support/solaris/sun_apm.c still includes only
"xf86Priv.h" (capital-P, a different header), so on Hammerhead/illumos - the
only platform that still compiles sun_apm.c - xf86OSPMOpen() fails with
"xf86PMGetEventFromOs undeclared" (GCC 14 hard error). This never surfaced
upstream because XLibre's CI has no illumos target. Add the missing include,
matching lnx_apm.c.

--- a/hw/xfree86/os-support/solaris/sun_apm.c
+++ b/hw/xfree86/os-support/solaris/sun_apm.c
@@ -58,6 +58,7 @@

 #include "os.h"
 #include "xf86.h"
+#include "xf86_priv.h"
 #include "xf86Priv.h"
 #include "xf86_os_support.h"
 #include "xf86_OSproc.h"