Merge branch 'solaris' into 'master'

Fix cairo-perf-print & pdf-structure test builds on Solaris

See merge request cairo/cairo!599

meson.build

@@ -138,6 +138,7 @@ check_headers = [
   ['sys/ioctl.h'],
   ['intsafe.h'],
   ['alloca.h'],
+  ['termios.h'],
 ]
 
 check_types = [

perf/cairo-perf-print.c

@@ -43,6 +43,9 @@
 #if USE_TERMINAL_SIZE
 #include <unistd.h>
 #include <sys/ioctl.h>
+#if HAVE_TERMIOS_H
+#include <termios.h>
+#endif
 #endif
 
 static void

test/pdf-structure.c

@@ -33,6 +33,9 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h> /* __unix__ */
 #endif
+#if HAVE_SYS_WAIT_H
+#include <sys/wait.h>
+#endif
 
 #include <cairo.h>
 #include <cairo-pdf.h>