pixman: Branch 'master'

[Vladimir Vukicevic]

 pixman/pixman-edge.c    |    2 +-
 pixman/pixman-image.c   |    1 -
 pixman/pixman-pict.c    |    2 +-
 pixman/pixman-private.h |   10 ++++++++++
 pixman/pixman-region.c  |    1 -
 pixman/pixman-utils.c   |    2 +-
 6 files changed, 13 insertions(+), 5 deletions(-)

New commits:
commit e95638c629334151e27633cc1c476ea582d766ec
Author: Vladimir Vukicevic <vladimir at pobox.com>
Date:   Sun Jan 27 14:49:12 2008 -0800

    Include only pixman-private.h, not pixman.h, in local .c files
    
    This is so that changes (such as symbol renames) can take place in
    pixman-private and ensure that they're included before the prototypes from
    pixman.h.  pixman-private.h includes pixman.h right at the start.

diff --git a/pixman/pixman-edge.c b/pixman/pixman-edge.c
index 4a9df9a..717284f 100644
--- a/pixman/pixman-edge.c
+++ b/pixman/pixman-edge.c
@@ -25,7 +25,7 @@
 #endif
 
 #include <string.h>
-#include "pixman.h"
+
 #include "pixman-private.h"
 
 #ifdef PIXMAN_FB_ACCESSORS
diff --git a/pixman/pixman-image.c b/pixman/pixman-image.c
index 1c4abc2..9b6846e 100644
--- a/pixman/pixman-image.c
+++ b/pixman/pixman-image.c
@@ -28,7 +28,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "pixman.h"
 #include "pixman-private.h"
 
 static void
diff --git a/pixman/pixman-pict.c b/pixman/pixman-pict.c
index 8a89566..3c299b5 100644
--- a/pixman/pixman-pict.c
+++ b/pixman/pixman-pict.c
@@ -29,7 +29,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "pixman.h"
+
 #include "pixman-private.h"
 #include "pixman-mmx.h"
 
diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
index 075feb6..7ddb635 100644
--- a/pixman/pixman-private.h
+++ b/pixman/pixman-private.h
@@ -27,6 +27,7 @@
 #  define BITMAP_BIT_ORDER LSBFirst
 #endif
 
+#undef DEBUG
 #define DEBUG 0
 
 #if defined (__GNUC__)
@@ -39,16 +40,25 @@
 
 #ifndef INT16_MIN
 # define INT16_MIN              (-32767-1)
+#endif
+
+#ifndef INT16_MAX
 # define INT16_MAX              (32767)
 #endif
 
 #ifndef INT32_MIN
 # define INT32_MIN              (-2147483647-1)
+#endif
+
+#ifndef INT32_MAX
 # define INT32_MAX              (2147483647)
 #endif
 
 #ifndef UINT32_MIN
 # define UINT32_MIN             (0)
+#endif
+
+#ifndef UINT32_MAX
 # define UINT32_MAX             (4294967295U)
 #endif
 
diff --git a/pixman/pixman-region.c b/pixman/pixman-region.c
index ac23806..496ce77 100644
--- a/pixman/pixman-region.c
+++ b/pixman/pixman-region.c
@@ -55,7 +55,6 @@ SOFTWARE.
 #include <stdio.h>
 
 #include "pixman-private.h"
-#include "pixman.h"
 
 typedef struct pixman_region16_point {
     int x, y;
diff --git a/pixman/pixman-utils.c b/pixman/pixman-utils.c
index 103a0a9..73c1cde 100644
--- a/pixman/pixman-utils.c
+++ b/pixman/pixman-utils.c
@@ -26,7 +26,7 @@
 #endif
 
 #include <stdlib.h>
-#include "pixman.h"
+
 #include "pixman-private.h"
 #include "pixman-mmx.h"