[cairo-commit] cairo/src cairo-wideint.h, 1.7, 1.8 cairoint.h, 1.119, 1.120

[Carl Worth]

Committed by: cworth

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

Modified Files:
	cairo-wideint.h cairoint.h 
Log Message:

        * configure.in:
        * src/cairo-wideint.h:
        * src/cairoint.h: Use configure-time checks for stdint.h
        vs. inttypes.h vs. sys/int_types.h rather than ad-hoc
        system-specific macros. Also define these types manually none of
        these header are available. (Thanks to Jason Dorje Short
        <jdorje at users.sf.net>).


Index: cairo-wideint.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-wideint.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- cairo-wideint.h	29 Mar 2005 19:48:58 -0000	1.7
+++ cairo-wideint.h	7 Apr 2005 19:05:52 -0000	1.8
@@ -38,13 +38,24 @@
 #ifndef CAIRO_WIDEINT_H
 #define CAIRO_WIDEINT_H
 
-#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>
+typedef signed char int8_t;
+typedef short int16_t;
+typedef long int32_t;
+typedef unsigned char uint8_t;
+typedef unsigned short uint16_t;
+typedef unsigned long uint32_t;
+
+# if sizeof(long long) == 64
+typedef long long int64_t;
+typedef unsigned long long uint64_t;
+#  define HAVE_UINT64_T
 # endif
 #endif
 

Index: cairoint.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairoint.h,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- cairoint.h	7 Apr 2005 18:04:00 -0000	1.119
+++ cairoint.h	7 Apr 2005 19:05:52 -0000	1.120
@@ -56,16 +56,6 @@
 #include <limits.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__)