pixman: Branch 'master'

[Alexander Larsson]

 pixman/pixman.h |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit cca1cef3f29d244f0a57bd3ed8b09e2892f8934a
Author: Alexander Larsson <alexl at redhat.com>
Date:   Tue Feb 9 13:22:38 2010 +0100

    Add extern "C" guards for c++

diff --git a/pixman/pixman.h b/pixman/pixman.h
index 4fce706..5e35d92 100644
--- a/pixman/pixman.h
+++ b/pixman/pixman.h
@@ -71,6 +71,10 @@ SOFTWARE.
 
 #include <pixman-version.h>
 
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
 /*
  * Standard integers
  */
@@ -909,4 +913,8 @@ void           pixman_rasterize_trapezoid  (pixman_image_t            *image,
 					    int                        x_off,
 					    int                        y_off);
 
+#ifdef  __cplusplus
+}
+#endif
+
 #endif /* PIXMAN_H__ */