[cairo-commit] cairo/src cairo-wideint.h, 1.6, 1.7 cairoint.h, 1.112, 1.113

[Tim Rowley]

Committed by: tor

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

Modified Files:
	cairo-wideint.h cairoint.h 
Log Message:
src/cairo-wideint.h: add preprocessor tests for stdint.h/inttypes.h

src/cairoint.h: add preprocessor tests for stdint.h/inttypes.h


Index: cairo-wideint.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-wideint.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- cairo-wideint.h	19 Jan 2005 15:11:14 -0000	1.6
+++ cairo-wideint.h	29 Mar 2005 19:48:58 -0000	1.7
@@ -38,7 +38,15 @@
 #ifndef CAIRO_WIDEINT_H
 #define CAIRO_WIDEINT_H
 
-#include <stdint.h>
+#if defined (__SVR4) && defined (__sun)
+# include <sys/int_types.h>
+#else
+# if defined (__OpenBSD__) || defined (_AIX)
+#  include <inttypes.h>
+# else 
+#  include <stdint.h>
+# endif
+#endif
 
 /*
  * 64-bit datatypes.  Two separate implementations, one using

Index: cairoint.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairoint.h,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- cairoint.h	23 Mar 2005 21:52:54 -0000	1.112
+++ cairoint.h	29 Mar 2005 19:48:58 -0000	1.113
@@ -54,9 +54,18 @@
 #include <string.h>
 #include <math.h>
 #include <limits.h>
-#include <stdint.h>
 #include <stdio.h>
 
+#if defined (__SVR4) && defined (__sun)
+# include <sys/int_types.h>
+#else
+# if defined (__OpenBSD__) || defined (_AIX)
+#  include <inttypes.h>
+# else 
+#  include <stdint.h>
+# endif
+#endif
+
 #include "cairo.h"
 
 #if __GNUC__ >= 3 && defined(__ELF__)