5. Various header-related build fixes for MacOSX 10.5 (Jaguar). It is at

      time unknown whether or not these negatively impact the build on older
      versions of Darwin  (Marc La France).

5 files changed, 13 insertions, 10 deletions

diff --git a/lib/GL/apple/dri_driver.c b/lib/GL/apple/dri_driver.c
index c88431046..6281263bc 100644
--- a/lib/GL/apple/dri_driver.c
+++ b/lib/GL/apple/dri_driver.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/GL/apple/dri_driver.c,v 1.5tsi Exp $ */
+/* $XFree86: xc/lib/GL/apple/dri_driver.c,v 1.6tsi Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -738,7 +738,7 @@ driCreatePixelFormat(Display *dpy, __DRIscreenPrivate *psp,
     int i;
     CGLPixelFormatAttribute attr[64]; // currently uses max of 30
     CGLPixelFormatObj result;
-    long n_formats;
+    GLint n_formats;
 
     i = 0;
 
diff --git a/lib/font/fontfile/decompress.c b/lib/font/fontfile/decompress.c
index 9600ff746..a0de6ff17 100644
--- a/lib/font/fontfile/decompress.c
+++ b/lib/font/fontfile/decompress.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/font/fontfile/decompress.c,v 1.8 2006/01/09 14:59:33 dawes Exp $ */
+/* $XFree86: xc/lib/font/fontfile/decompress.c,v 1.9tsi Exp $ */
 
 /*-
  * Copyright (c) 2005
@@ -77,7 +77,7 @@
 
 #include "fontmisc.h"
 #include <bufio.h>
-#ifdef __UNIXOS2__
+#if defined(__UNIXOS2__) || defined(__DARWIN__)
 #include <sys/types.h>
 #endif
 
diff --git a/lib/xtrans/Xtranssock.c b/lib/xtrans/Xtranssock.c
index c2adef6ce..b6c762ddf 100644
--- a/lib/xtrans/Xtranssock.c
+++ b/lib/xtrans/Xtranssock.c
@@ -1,3 +1,4 @@
+/* $XFree86: xc/lib/xtrans/Xtranssock.c,v 3.74tsi Exp $ */
 /*
 
 Copyright 1993, 1994, 1998  The Open Group
@@ -26,7 +27,6 @@ other dealings in this Software without prior written authorization
 from the copyright holders.
 
 */
-/* $XFree86: xc/lib/xtrans/Xtranssock.c,v 3.73tsi Exp $ */
 
 /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA
  *
@@ -86,7 +86,7 @@ from the copyright holders.
 #endif 
 
 #ifndef NO_TCP_H
-#if defined(__osf__) || defined(linux)
+#if defined(__osf__) || defined(linux) || defined(__DARWIN__)
 #include <sys/param.h>
 #endif /* osf */
 #if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) 
diff --git a/programs/Xserver/GL/apple/indirect.c b/programs/Xserver/GL/apple/indirect.c
index 3b7f2b1c6..6d47becbe 100644
--- a/programs/Xserver/GL/apple/indirect.c
+++ b/programs/Xserver/GL/apple/indirect.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/apple/indirect.c,v 1.4tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/apple/indirect.c,v 1.5tsi Exp $ */
 /*
  * GLX implementation that uses Apple's OpenGL.framework
  * (Indirect rendering path)
@@ -453,7 +453,7 @@ static CGLPixelFormatObj makeFormat(__GLcontextModes *mode)
     int i;
     CGLPixelFormatAttribute attr[64]; // currently uses max of 30
     CGLPixelFormatObj result;
-    long n_formats;
+    GLint n_formats;
     CGLError gl_err;
     
     GLAQUA_DEBUG_MSG("makeFormat\n");
diff --git a/programs/Xserver/hw/xfree86/CHANGELOG b/programs/Xserver/hw/xfree86/CHANGELOG
index 7b45422dd..1d6938a96 100644
--- a/programs/Xserver/hw/xfree86/CHANGELOG
+++ b/programs/Xserver/hw/xfree86/CHANGELOG
@@ -1,4 +1,7 @@
-XFree86 4.8.99.1 (?? January 2009)
+XFree86 4.8.99.1 (?? February 2009)
+   5. Various header-related build fixes for MacOSX 10.5 (Jaguar).  It is at
+      time unknown whether or not these negatively impact the build on older
+      versions of Darwin  (Marc La France).
    4. Enable HasLibPthread for FreeBSD 7 and later because libc_r is no
       longer present, and was deprecated since some earlier release (6.x?)
       (David Dawes).
@@ -20846,4 +20849,4 @@ XFree86 3.0a (28 April 1994)
 XFree86 3.0 (26 April 1994)
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3988 2008/12/14 17:32:59 tsi Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3989 2008/12/27 04:17:11 dawes Exp $