diff options
| author | Søren Sandmann Pedersen <ssp@redhat.com> | 2010-03-01 10:32:39 -0500 |
|---|---|---|
| committer | Søren Sandmann Pedersen <ssp@redhat.com> | 2010-03-14 12:24:50 -0400 |
| commit | 2b5f7be6c05ce3643b7d29e7237f91bfaedd80e5 (patch) | |
| tree | b7ce5c4da29f93060bc955de9c5b6d5091d3582e | |
| parent | f4da05c9f988133079cac2b8d54589386f46398f (diff) | |
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.
| -rw-r--r-- | pixman/pixman.h | 5 |
1 files changed, 5 insertions, 0 deletions
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 */ |