[cairo-commit] pixman/src

[Carl Worth]

 pixman/src/pixman.h |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

New commits:
diff-tree e32138aa93ba37d760af87294fbb47046bfe6dec (from 14ffde038038deda66973856a5f3b9442c8d3c7d)
Author: Carl Worth <cworth at cworth.org>
Date:   Sun Jun 25 14:42:27 2006 +0200

    Prefer using configure-generated variable for finding stdint.h or similar.
    
    We were doing something more complicated originally, and that was because
    pixman.h was an installed public header file at one time. But that hasn't
    been the case for quite a long time.

diff --git a/pixman/src/pixman.h b/pixman/src/pixman.h
index e925227..33734f2 100644
--- a/pixman/src/pixman.h
+++ b/pixman/src/pixman.h
@@ -74,11 +74,13 @@ SOFTWARE.
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-#if defined (__SVR4) && defined (__sun)
-# include <sys/int_types.h>
-#elif defined (__OpenBSD__) || defined (_AIX) || defined (__osf__) || defined (__hpux__)
+#if   HAVE_STDINT_H
+# include <stdint.h>
+#elif HAVE_INTTYPES_H
 # include <inttypes.h>
-#elif defined (_MSC_VER)
+#elif HAVE_SYS_INT_TYPES_H
+# include <sys/int_types.h>
+#elif defined(_MSC_VER)
   typedef __int8 int8_t;
   typedef unsigned __int8 uint8_t;
   typedef __int16 int16_t;
@@ -88,7 +90,7 @@ SOFTWARE.
   typedef __int64 int64_t;
   typedef unsigned __int64 uint64_t;
 #else
-# include <stdint.h>
+#error Cannot find definitions for fixed-width integral types (uint8_t, uint32_t, etc.)
 #endif
 
 #include "pixman-remap.h"