xserver: Branch 'xorg-server-1.4-apple' - 2 commits

[Jeremy Huddleston]

 configure.ac                |    2 +-
 hw/xquartz/X11Application.m |    2 +-
 hw/xquartz/quartzKeyboard.c |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit aaa3d5ada9345bbe9842e15da5d168918b9ef197
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Sun Nov 16 15:35:45 2008 -0800

    XQuartz: 1.4.2-apple23

diff --git a/configure.ac b/configure.ac
index cbc541f..2518ee2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.4.2-apple22, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.4.2-apple23, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE
commit 91f3c3435716195e6d606c8e2f6b0de52eb5972d
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Sun Nov 16 15:35:17 2008 -0800

    XQuartz: Use AvailabilityMacros.h instead of availability.h for Tiger

diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index 95f8b46..9df4bce 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -47,7 +47,7 @@
 
 #include <mach/mach.h>
 #include <unistd.h>
-#include <available.h>
+#include <AvailabilityMacros.h>
 
 #include <Xplugin.h>
 
diff --git a/hw/xquartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c
index 2eb5fee..4337f51 100644
--- a/hw/xquartz/quartzKeyboard.c
+++ b/hw/xquartz/quartzKeyboard.c
@@ -44,7 +44,7 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <available.h>
+#include <AvailabilityMacros.h>
 
 #include "quartzCommon.h"
 #include "darwin.h"