aboutsummaryrefslogtreecommitdiff
path: root/pixman/pixman/pixman.h
diff options
context:
space:
mode:
Diffstat (limited to 'pixman/pixman/pixman.h')
-rw-r--r--pixman/pixman/pixman.h8
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