[cairo-commit] cairo/pixman/src pixman.h,1.22,1.22.4.1

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo/pixman/src
In directory gabe:/tmp/cvs-serv4238/pixman/src

Modified Files:
      Tag: BRANCH_1_0
	pixman.h 
Log Message:

2005-09-26  Carl Worth  <cworth at cworth.org>

        Backported from HEAD:
        2005-09-07  Carl Worth  <cworth at cworth.org>

        Portability improvements for win32 thanks to Hans Breuer
        <hans at breuer.org>:

        * pixman/src/pixman.h: Defined sized-integer types when under the
        influence of _MSC_VER and without stdint.h.

        * src/cairoint.h: Use #error which is more portable than #warning,
        (and more indicative of where we want to be before the next
        release).


Index: pixman.h
===================================================================
RCS file: /cvs/cairo/cairo/pixman/src/pixman.h,v
retrieving revision 1.22
retrieving revision 1.22.4.1
diff -u -d -r1.22 -r1.22.4.1
--- pixman.h	10 Aug 2005 19:36:51 -0000	1.22
+++ pixman.h	26 Sep 2005 22:48:06 -0000	1.22.4.1
@@ -83,12 +83,19 @@
 
 #if defined (__SVR4) && defined (__sun)
 # include <sys/int_types.h>
+#elif defined (__OpenBSD__) || defined (_AIX)
+# include <inttypes.h>
+#elif defined (_MSC_VER)
+  typedef __int8 int8_t;
+  typedef unsigned __int8 uint8_t;
+  typedef __int16 int16_t;
+  typedef unsigned __int16 uint16_t;
+  typedef __int32 int32_t;
+  typedef unsigned __int32 uint32_t;
+  typedef __int64 int64_t;
+  typedef unsigned __int64 uint64_t;
 #else
-# if defined (__OpenBSD__) || defined (_AIX)
-#  include <inttypes.h>
-# else 
-#  include <stdint.h>
-# endif
+# include <stdint.h>
 #endif
 
 #include "pixman-remap.h"