From 17d6c05c5eb4f9ec0cce6c1df676ca66c969e457 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed, 27 Jan 2021 13:43:01 -0800
Subject: xquartz: Remove unused include of AvailabilityMacros.h from various
 sources

Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 5e7c0762e6fdaefc9b8257c0f875432b1877c49e)
---
 hw/xquartz/GL/indirect.c              | 2 --
 hw/xquartz/X11Application.m           | 1 -
 hw/xquartz/X11Controller.m            | 1 -
 hw/xquartz/mach-startup/bundle-main.c | 1 -
 hw/xquartz/mach-startup/stub.c        | 2 --
 hw/xquartz/pbproxy/pbproxy.h          | 2 --
 hw/xquartz/quartzKeyboard.c           | 1 -
 hw/xquartz/quartzRandR.c              | 2 --
 hw/xquartz/xpr/dri.c                  | 2 --
 9 files changed, 14 deletions(-)

diff --git a/hw/xquartz/GL/indirect.c b/hw/xquartz/GL/indirect.c
index 6738946ff..a8ccfc8ee 100644
--- a/hw/xquartz/GL/indirect.c
+++ b/hw/xquartz/GL/indirect.c
@@ -35,8 +35,6 @@
 #include <dix-config.h>
 #endif
 
-#include <AvailabilityMacros.h>
-
 #include <dlfcn.h>
 
 #include <OpenGL/OpenGL.h>
diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index b42c6912d..601826319 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -48,7 +48,6 @@
 
 #include <mach/mach.h>
 #include <unistd.h>
-#include <AvailabilityMacros.h>
 
 #include <pthread.h>
 
diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
index bc976bf5f..c0604b773 100644
--- a/hw/xquartz/X11Controller.m
+++ b/hw/xquartz/X11Controller.m
@@ -29,7 +29,6 @@
  */
 
 #include "sanitizedCarbon.h"
-#include <AvailabilityMacros.h>
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
diff --git a/hw/xquartz/mach-startup/bundle-main.c b/hw/xquartz/mach-startup/bundle-main.c
index 280324d60..42530cba1 100644
--- a/hw/xquartz/mach-startup/bundle-main.c
+++ b/hw/xquartz/mach-startup/bundle-main.c
@@ -29,7 +29,6 @@
  */
 
 #include <CoreFoundation/CoreFoundation.h>
-#include <AvailabilityMacros.h>
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
diff --git a/hw/xquartz/mach-startup/stub.c b/hw/xquartz/mach-startup/stub.c
index fad7ea76d..f5fef90fb 100644
--- a/hw/xquartz/mach-startup/stub.c
+++ b/hw/xquartz/mach-startup/stub.c
@@ -50,8 +50,6 @@
 
 #include <signal.h>
 
-#include <AvailabilityMacros.h>
-
 #include "launchd_fd.h"
 
 static char x11_path[PATH_MAX + 1];
diff --git a/hw/xquartz/pbproxy/pbproxy.h b/hw/xquartz/pbproxy/pbproxy.h
index 1b94097b7..482f95ea6 100644
--- a/hw/xquartz/pbproxy/pbproxy.h
+++ b/hw/xquartz/pbproxy/pbproxy.h
@@ -35,8 +35,6 @@
 
 #include <asl.h>
 
-#include <AvailabilityMacros.h>
-
 #define  Cursor X_Cursor
 #undef _SHAPE_H_
 #include <X11/Xlib.h>
diff --git a/hw/xquartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c
index 793e9cc60..d854cd196 100644
--- a/hw/xquartz/quartzKeyboard.c
+++ b/hw/xquartz/quartzKeyboard.c
@@ -46,7 +46,6 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <AvailabilityMacros.h>
 
 #include "quartz.h"
 #include "darwin.h"
diff --git a/hw/xquartz/quartzRandR.c b/hw/xquartz/quartzRandR.c
index 2e0c7b53d..795d1915c 100644
--- a/hw/xquartz/quartzRandR.c
+++ b/hw/xquartz/quartzRandR.c
@@ -42,8 +42,6 @@
 
 #include "X11Application.h"
 
-#include <AvailabilityMacros.h>
-
 #include <X11/extensions/randr.h>
 #include <randrstr.h>
 #include <IOKit/graphics/IOGraphicsTypes.h>
diff --git a/hw/xquartz/xpr/dri.c b/hw/xquartz/xpr/dri.c
index 67ea6a006..091418e19 100644
--- a/hw/xquartz/xpr/dri.c
+++ b/hw/xquartz/xpr/dri.c
@@ -69,8 +69,6 @@
 #include "x-hook.h"
 #include "driWrap.h"
 
-#include <AvailabilityMacros.h>
-
 static DevPrivateKeyRec DRIScreenPrivKeyRec;
 #define DRIScreenPrivKey       (&DRIScreenPrivKeyRec)
 static DevPrivateKeyRec DRIWindowPrivKeyRec;
-- 
cgit v1.2.1