pixman: Branch 'master' - 3 commits

[Søren Sandmann Pedersen]

 TODO            |    4 ++++
 configure.ac    |   10 +++++-----
 pixman/pixman.h |    2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 5e7388540f2cd201331cb3d1f616e3c300dbc45f
Author: Søren Sandmann Pedersen <sandmann at daimi.au.dk>
Date:   Sat Sep 6 05:14:18 2008 -0400

    Check for __sun || __sun in pixman.h. Update TODO
    
    Reported by Bernd Nies.

diff --git a/TODO b/TODO
index 3bed70c..9468021 100644
--- a/TODO
+++ b/TODO
@@ -35,6 +35,10 @@
         to indicate the actual depth. That way PIXMAN_x4c4 and PIXMAN_c8
 	won't collide.
 
+  - Maybe bite the bullet and make configure.ac generate a pixman-types.h
+    file that can be included from pixman.h to avoid the #ifdef magic
+    in pixman.h
+
   - Make pixman_region_point_in() survive a NULL box, then fix up
     pixman-compose.c
 
diff --git a/pixman/pixman.h b/pixman/pixman.h
index 977c0a6..36d91a9 100644
--- a/pixman/pixman.h
+++ b/pixman/pixman.h
@@ -74,7 +74,7 @@ SOFTWARE.
 /*
  * Standard integers
  */
-#if defined (_SVR4) || defined (SVR4) || defined (__OpenBSD__) || defined (_sgi)
+#if defined (_SVR4) || defined (SVR4) || defined (__OpenBSD__) || defined (_sgi) || defined (__sun) || defined (sun)
 #  include <inttypes.h>
 #elif defined (_MSC_VER)
 typedef __int8 int8_t;
commit f369d612b3d65529e4b10d8a0b1e015407357d9b
Author: Søren Sandmann Pedersen <sandmann at daimi.au.dk>
Date:   Sat Sep 6 04:33:16 2008 -0400

    Use error instead of #error in a couple of other places

diff --git a/configure.ac b/configure.ac
index 66ba962..cddf1a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -128,7 +128,7 @@ AC_MSG_CHECKING([for -xldscope (Sun compilers)])
 AC_COMPILE_IFELSE([
 #if defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
 #else
-#error Need Sun Studio 8 for visibility
+error Need Sun Studio 8 for visibility
 #endif
 int main () { return 0; } 
 ], have_sunstudio8=yes)
@@ -149,7 +149,7 @@ xserver_save_CFLAGS=$CFLAGS
 CFLAGS="$CFLAGS $MMX_CFLAGS"
 AC_COMPILE_IFELSE([
 #if defined(__GNUC__) && (__GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 4))
-#error "Need GCC >= 3.4 for MMX intrinsics"
+error "Need GCC >= 3.4 for MMX intrinsics"
 #endif
 #include <mmintrin.h>
 int main () {
@@ -243,7 +243,7 @@ xserver_save_CFLAGS=$CFLAGS
 CFLAGS="$CFLAGS $VMX_CFLAGS"
 AC_COMPILE_IFELSE([
 #if defined(__GNUC__) && (__GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 4))
-#error "Need GCC >= 3.4 for sane altivec support"
+error "Need GCC >= 3.4 for sane altivec support"
 #endif
 #include <altivec.h>
 int main () {
commit f921c8c57ffdd6d0afd3d41d50e3565084ebd49c
Author: Peter O'Gorman <pogma at thewrittenword.com>
Date:   Fri Aug 15 15:00:24 2008 -0500

    Minor portability fixes
    
    Use AC_C_INLINE to figure out `inline'.
    IRIX compiler does not exit with a non-zero exit status when it sees #error

diff --git a/configure.ac b/configure.ac
index 9139f38..66ba962 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,7 +67,7 @@ AC_PROG_CC
 AC_PROG_LIBTOOL
 AC_CHECK_FUNCS([getisax])
 AC_C_BIGENDIAN
-
+AC_C_INLINE
 # 
 # We ignore pixman_major in the version here because the major version should
 # always be encoded in the actual library name. Ie., the soname is:
@@ -113,7 +113,7 @@ AC_MSG_CHECKING(for -fvisibility)
 AC_COMPILE_IFELSE([
 #if defined(__GNUC__) && (__GNUC__ >= 4)
 #else
-#error Need GCC 4.0 for visibility
+error Need GCC 4.0 for visibility
 #endif
 int main () { return 0; } 
 ], have_gcc4=yes)