pixman: Branch 'master'

Sat Feb 20 23:16:53 PST 2010

pixman/pixman.h |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

New commits:
commit ad5cbba4c05f8521004c6aa1afd5aa74040afad0
Author: SÃ¸ren Sandmann Pedersen <ssp at redhat.com>
Date:   Sun Feb 21 02:01:16 2010 -0500

    Hide the C++ extern "C" declarations behind macros.
    
    That way they don't confuse the indenting algorithm in editors such as
    Emacs.

diff --git a/pixman/pixman.h b/pixman/pixman.h
index 5009c6d..69af0f9 100644
--- a/pixman/pixman.h
+++ b/pixman/pixman.h
@@ -72,9 +72,15 @@ SOFTWARE.
 #include <pixman-version.h>
 
 #ifdef  __cplusplus
-extern "C" {
+#define PIXMAN_BEGIN_DECLS extern "C" {
+#define PIXMAN_END_DECLS }
+#else
+#define PIXMAN_BEGIN_DECLS
+#define PIXMAN_END_DECLS
 #endif
 
+PIXMAN_BEGIN_DECLS
+
 /*
  * Standard integers
  */
@@ -918,8 +924,6 @@ void           pixman_rasterize_trapezoid  (pixman_image_t            *image,
 					    int                        x_off,
 					    int                        y_off);
 
-#ifdef  __cplusplus
-}
-#endif
+PIXMAN_END_DECLS
 
 #endif /* PIXMAN_H__ */
