pixman: Branch 'master'

[Søren Sandmann Pedersen]

 pixman/pixman.h |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 99fead412e7602daf193035831b952e252dac0e1
Author: Søren Sandmann Pedersen <sandmann at daimi.au.dk>
Date:   Wed Jul 16 15:07:30 2008 -0400

    Use <inttypes.h> on most types of Unix.
    
    Fix for bug 15560.

diff --git a/pixman/pixman.h b/pixman/pixman.h
index f60534b..c3b3184 100644
--- a/pixman/pixman.h
+++ b/pixman/pixman.h
@@ -74,10 +74,7 @@ SOFTWARE.
 /*
  * Standard integers
  */
-#if defined (__SVR4) && defined (__sun)
-#  include <sys/int_types.h>
-#  include <stdint.h>
-#elif defined (__OpenBSD__) || defined (__sgi)
+#if defined (_SVR4) || defined (SVR4) || defined (__OpenBSD__) || defined (_sgi)
 #  include <inttypes.h>
 #elif defined (_MSC_VER)
 typedef __int8 int8_t;