From 05b119d78e1c6a4db563b2a976cee0173489f9b6 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu, 8 May 2008 11:36:03 -0700
Subject: [PATCH] Apple: Cleaned up some Apple definitions

---
 Xosdefs.h  | 2 +-
 Xpoll.h.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Xosdefs.h b/Xosdefs.h
index 14971c4..903a5a0 100644
--- a/Xosdefs.h
+++ b/Xosdefs.h
@@ -156,7 +156,7 @@ in this Software without prior written authorization from The Open Group.
 #endif
 
 #if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) \
-	|| defined(__Darwin__) || defined(__DragonFly__)
+	|| defined(__APPLE__) || defined(__DragonFly__)
 # ifndef CSRG_BASED
 #  define CSRG_BASED
 # endif
diff --git a/Xpoll.h.in b/Xpoll.h.in
index 3940489..33fdad4 100644
--- a/Xpoll.h.in
+++ b/Xpoll.h.in
@@ -91,7 +91,7 @@ from The Open Group.
 
 #ifdef CSRG_BASED
 #include <sys/param.h>
-# if BSD < 199103 || defined(__APPLE__)
+# if BSD < 199103
 typedef long fd_mask;
 # endif
 #endif