diff options
| author | marha <marha@users.sourceforge.net> | 2010-03-20 14:58:29 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-03-20 14:58:29 +0000 |
| commit | 6fc6cb8c935fab174e4582909c1cb4f12bd598bf (patch) | |
| tree | fbd65a4b2b3b1d3e92a0cba54d8391c4a610f0d9 /pixman/pixman/pixman.h | |
| parent | d792a6e870288fd8f0baf9943caf1628224b764c (diff) | |
| parent | 501c558c841fc5bc1a67e6dc8d33c8605276f504 (diff) | |
| download | vcxsrv-6fc6cb8c935fab174e4582909c1cb4f12bd598bf.tar.gz vcxsrv-6fc6cb8c935fab174e4582909c1cb4f12bd598bf.tar.bz2 vcxsrv-6fc6cb8c935fab174e4582909c1cb4f12bd598bf.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'pixman/pixman/pixman.h')
| -rw-r--r-- | pixman/pixman/pixman.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pixman/pixman/pixman.h b/pixman/pixman/pixman.h index 69af0f90f..85fcc8c28 100644 --- a/pixman/pixman/pixman.h +++ b/pixman/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 */ @@ -343,9 +348,10 @@ typedef enum PIXMAN_OP_HSL_HUE = 0x3b, PIXMAN_OP_HSL_SATURATION = 0x3c, PIXMAN_OP_HSL_COLOR = 0x3d, - PIXMAN_OP_HSL_LUMINOSITY = 0x3e, + PIXMAN_OP_HSL_LUMINOSITY = 0x3e #ifdef PIXMAN_USE_INTERNAL_API + , PIXMAN_N_OPERATORS, PIXMAN_OP_NONE = PIXMAN_N_OPERATORS #endif |