pixman: Branch 'master'

[Søren Sandmann Pedersen]

 configure.ac            |    2 --
 pixman/pixman-private.h |    3 +++
 pixman/pixman.h         |    2 +-
 test/composite.c        |    1 -
 test/window-test.c      |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit b8898d77d0e7cc1c50321fcb216af3ba6c634959
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date:   Sat Nov 7 14:47:22 2009 -0500

    Define PIXMAN_USE_INTERNAL_API in pixman-private.h
    
    Instead of mucking around with CFLAGS in configure.ac, preventing
    users from setting their own CFLAGS, just define the
    PIXMAN_USE_INTERNAL_API and PIXMAN_DISABLE_DEPRECATED in
    pixman-private.h

diff --git a/configure.ac b/configure.ac
index 12c7f75..172656a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -92,8 +92,6 @@ then
   CFLAGS="-O -g"
 fi
 
-CFLAGS="$CFLAGS -DPIXMAN_DISABLE_DEPRECATED -DPIXMAN_INTERNAL_API"
-
 # 
 # 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:
diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
index 7d7b87d..ce9a5bf 100644
--- a/pixman/pixman-private.h
+++ b/pixman/pixman-private.h
@@ -5,6 +5,9 @@
 #ifndef PIXMAN_PRIVATE_H
 #define PIXMAN_PRIVATE_H
 
+#define PIXMAN_DISABLE_DEPRECATED
+#define PIXMAN_USE_INTERNAL_API
+
 #include "pixman.h"
 #include <time.h>
 #include <assert.h>
diff --git a/pixman/pixman.h b/pixman/pixman.h
index 2ce8c72..ba2b242 100644
--- a/pixman/pixman.h
+++ b/pixman/pixman.h
@@ -334,7 +334,7 @@ typedef enum
     PIXMAN_OP_HSL_COLOR			= 0x3d,
     PIXMAN_OP_HSL_LUMINOSITY		= 0x3e,
 
-#ifdef PIXMAN_INTERNAL_API
+#ifdef PIXMAN_USE_INTERNAL_API
     PIXMAN_N_OPERATORS,
     PIXMAN_OP_NONE = PIXMAN_N_OPERATORS
 #endif
diff --git a/test/composite.c b/test/composite.c
index 594e8cc..0624cd3 100644
--- a/test/composite.c
+++ b/test/composite.c
@@ -422,7 +422,6 @@ calc_op (pixman_op_t op, double src, double dst, double srca, double dsta)
     case PIXMAN_OP_HSL_SATURATION:
     case PIXMAN_OP_HSL_COLOR:
     case PIXMAN_OP_HSL_LUMINOSITY:
-    case PIXMAN_OP_NONE:
     default:
 	abort();
     }
diff --git a/test/window-test.c b/test/window-test.c
index bbaa3e2..084e23a 100644
--- a/test/window-test.c
+++ b/test/window-test.c
@@ -1,8 +1,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <config.h>
-#include "pixman.h"
 #include "pixman-private.h"
+#include "pixman.h"
 
 #define FALSE 0
 #define TRUE 1