From: Søren Sandmann Pedersen <ssp@redhat.com>
Date: Mon, 1 Mar 2010 15:32:39 +0000 (-0500)
Subject: pixman.h: Only define stdint types when PIXMAN_DONT_DEFINE_STDINT is undefined
X-Git-Tag: 1.0_branch~620
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2b5f7be6c05ce3643b7d29e7237f91bfaedd80e5;p=profile%2Fivi%2Fpixman.git

pixman.h: Only define stdint types when PIXMAN_DONT_DEFINE_STDINT is undefined

In SPICE, with Microsoft Visual C++, pixman.h is included after
another file that defines these types, which causes warnings and
errors.

This patch allows such code to just define PIXMAN_DONT_DEFINE_STDINT
to use its own version of those types.
---

diff --git a/pixman/pixman.h b/pixman/pixman.h
index 23feb2f..85fcc8c 100644
--- a/pixman/pixman.h
+++ b/pixman/pixman.h
@@ -84,6 +84,9 @@ PIXMAN_BEGIN_DECLS
 /*
  * Standard integers
  */
+
+#if !defined (PIXMAN_DONT_DEFINE_STDINT)
+
 #if defined (_SVR4) || defined (SVR4) || defined (__OpenBSD__) || defined (_sgi) || defined (__sun) || defined (sun) || defined (__digital__) || defined (__HP_cc)
 #  include <inttypes.h>
 #elif defined (_MSC_VER)
@@ -101,6 +104,8 @@ typedef unsigned __int64 uint64_t;
 #  include <stdint.h>
 #endif
 
+#endif
+
 /*
  * Boolean
  */