--- /dev/null	2005-06-01 05:31:32.064058960 -0700
+++ libpixman/src/mozstdint.h	2005-06-01 19:46:42.000000000 -0700
@@ -0,0 +1,64 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Google Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2005
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Brian Ryner <bryner@brianryner.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/*
+ * This header provides NSPR-based stdint.h definitions for platforms that are
+ * missing the system header.
+ */
+
+#ifndef mozstdint_h_
+#define mozstdint_h_
+
+#include "prtypes.h"
+
+typedef PRInt8   int8_t;
+typedef PRInt16  int16_t;
+typedef PRInt32  int32_t;
+typedef PRInt64  int64_t;
+
+typedef PRUint8  uint8_t;
+typedef PRUint16 uint16_t;
+typedef PRUint32 uint32_t;
+typedef PRUint64 uint64_t;
+
+/* NSPR is able to use 64-bit storage for all currently-supported platforms. */
+#ifndef HAVE_UINT64_T
+#define HAVE_UINT64_T 1
+#endif
+
+#endif
--- ../../../../../cairo-cvs/dist/libpixman-0.1.5/src/pixman.h	2005-05-18 09:25:54.000000000 -0700
+++ libpixman/src/pixman.h	2005-06-01 22:05:54.000000000 -0700
@@ -81,14 +81,14 @@
  */
 
 
-#if defined (__SVR4) && defined (__sun)
+#if HAVE_STDINT_H
+# include <stdint.h>
+#elif HAVE_INTTYPES_H
+# include <inttypes.h>
+#elif HAVE_SYS_INT_TYPES_H
 # include <sys/int_types.h>
 #else
-# if defined (__OpenBSD__) || defined (_AIX)
-#  include <inttypes.h>
-# else 
-#  include <stdint.h>
-# endif
+# include "mozstdint.h"
 #endif
 
 
--- ../../../../../cairo-cvs/dist/cairo-0.5.0/src/cairo-wideint.h	2005-05-10 14:55:37.000000000 -0700
+++ cairo/src/cairo-wideint.h	2005-06-01 22:07:43.000000000 -0700
@@ -45,7 +45,7 @@
 #elif HAVE_SYS_INT_TYPES_H
 # include <sys/int_types.h>
 #else
-#error Cannot find definitions for fixed-width integral types (uint8_t, uint32_t, etc.)
+# include "mozstdint.h"
 #endif
 
 /*