pixman: Branch 'master'

[Søren Sandmann Pedersen]

 pixman/pixman.h |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 933540861383da27402680593edefe8d61e6fb02
Author: Egor Starkov <starkov.egor at gmail.com>
Date:   Fri Mar 12 09:47:59 2010 -0500

    Eliminate trailing comma in enum
    
    https://bugs.freedesktop.org/show_bug.cgi?id=27050
    
    Pixman is not compiling with c++ compiler. During compilation it gives
    the following error:
    
    /usr/include/pixman-1/pixman.h:335: error: comma at end of enumerator list
    
    Signed-off-by: Søren Sandmann Pedersen <ssp at redhat.com>

diff --git a/pixman/pixman.h b/pixman/pixman.h
index 69af0f9..23feb2f 100644
--- a/pixman/pixman.h
+++ b/pixman/pixman.h
@@ -343,9 +343,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