pixman: Branch 'master'

[Jeff Muizelaar]

 pixman/pixman-conical-gradient.c |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 1f0cba3bdcc5d9a48c9189e8110c90d79260888a
Author: Jeff Muizelaar <jmuizelaar at mozilla.com>
Date:   Tue Apr 27 15:23:20 2010 -0400

    Add missing HAVE_CONFIG_H guards for config.h inclusion

diff --git a/pixman/pixman-conical-gradient.c b/pixman/pixman-conical-gradient.c
index 369a7a5..0341a8e 100644
--- a/pixman/pixman-conical-gradient.c
+++ b/pixman/pixman-conical-gradient.c
@@ -23,7 +23,11 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  * SOFTWARE.
  */
+
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <stdlib.h>
 #include <math.h>
 #include "pixman-private.h"