From: Søren Sandmann Pedersen <[email protected]> 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. Cc: [email protected] --- pixman/pixman.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/pixman/pixman.h b/pixman/pixman.h index 69af0f9..ce1cca0 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 */ -- 1.6.0.6 _______________________________________________ Pixman mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/pixman
