[gjs: 20/45] [cairo] ImageSurface is not optional

[Johan Dahlin <johan src gnome org>]

commit 5fd5456b92a1d8cf165490b1175e1b6d0133cb72
Author: Johan Dahlin <johan gnome org>
Date:   Thu Feb 25 18:30:35 2010 -0300

    [cairo] ImageSurface is not optional

 modules/cairo-image-surface.c |    4 ----
 modules/cairo-private.h       |    3 ---
 modules/cairo.c               |    2 --
 3 files changed, 0 insertions(+), 9 deletions(-)
---
diff --git a/modules/cairo-image-surface.c b/modules/cairo-image-surface.c
index 37e5e44..f15710b 100644
--- a/modules/cairo-image-surface.c
+++ b/modules/cairo-image-surface.c
@@ -26,8 +26,6 @@
 #include <cairo.h>
 #include "cairo-private.h"
 
-#ifdef CAIRO_HAS_IMAGE_SURFACE
-
 GJS_DEFINE_PROTO("CairoImageSurface", gjs_cairo_image_surface)
 
 static JSBool
@@ -127,5 +125,3 @@ gjs_cairo_image_surface_init(JSContext *context, JSObject *module_obj)
                            1, GJS_MODULE_PROP_FLAGS))
         return JS_FALSE;
 }
-
-#endif /* CAIRO_HAS_IMAGE_SURFACE */
diff --git a/modules/cairo-private.h b/modules/cairo-private.h
index 1062fa4..fbdf7a8 100644
--- a/modules/cairo-private.h
+++ b/modules/cairo-private.h
@@ -58,15 +58,12 @@ cairo_surface_t* gjs_cairo_surface_get_surface          (JSContext       *contex
                                                          JSObject        *object);
 
 /* image surface */
-#ifdef CAIRO_HAS_IMAGE_SURFACE
 jsval            gjs_cairo_image_surface_create_proto   (JSContext       *context,
                                                          JSObject        *module,
                                                          const char      *proto_name,
                                                          JSObject        *parent);
 void             gjs_cairo_image_surface_init           (JSContext       *context,
                                                          JSObject        *object);
-#endif
-
 /* postscript surface */
 #ifdef CAIRO_HAS_PS_SURFACE
 jsval            gjs_cairo_ps_surface_create_proto      (JSContext       *context,
diff --git a/modules/cairo.c b/modules/cairo.c
index d39e84e..bfa231c 100644
--- a/modules/cairo.c
+++ b/modules/cairo.c
@@ -44,13 +44,11 @@ gjs_js_define_cairo_stuff(JSContext *context,
         return JS_FALSE;
     surface_proto = JSVAL_TO_OBJECT(obj);
 
-#if CAIRO_HAS_IMAGE_SURFACE
     obj = gjs_cairo_image_surface_create_proto(context, module,
                                                "ImageSurface", surface_proto);
     if (obj == JSVAL_NULL)
         return JS_FALSE;
     gjs_cairo_image_surface_init(context, JSVAL_TO_OBJECT(obj));
-#endif
 
 #if CAIRO_HAS_PS_SURFACE
     obj = gjs_cairo_ps_surface_create_proto(context, module,