pango 0.90.7 → 0.90.8

data/ext/pango/rbpangofontset.c

@@ -16,33 +16,27 @@
 static ID id_call;
 
 static VALUE
-fontset_get_font(self, wc)
-    VALUE self, wc;
+fontset_get_font(VALUE self, VALUE wc)
 {
     return GOBJ2RVAL(pango_fontset_get_font(_SELF(self), NUM2UINT(wc)));
 }
 
 static VALUE
-fontset_get_metrics(self)
-    VALUE self;
+fontset_get_metrics(VALUE self)
 {
     return BOXED2RVAL(pango_fontset_get_metrics(_SELF(self)), PANGO_TYPE_FONT_METRICS);
 }
 
 #if PANGO_CHECK_VERSION(1,4,0)
 static gboolean
-fontset_each(fontset, font, func)
-    PangoFontset* fontset;
-    PangoFont* font;
-    gpointer func;
+fontset_each(PangoFontset *fontset, PangoFont *font, gpointer func)
 {
     return RVAL2CBOOL(rb_funcall((VALUE)func, id_call, 
                             2, GOBJ2RVAL(fontset), GOBJ2RVAL(font)));
 }
 
 static VALUE
-fontset_foreach(self)
-    VALUE self;
+fontset_foreach(VALUE self)
 {
     VALUE func = rb_block_proc();
     G_RELATIVE(self, func);

data/ext/pango/rbpangofontsetsimple.c

@@ -17,24 +17,21 @@
 #define RVAL2LANG(v) ((PangoLanguage*)RVAL2BOXED(v, PANGO_TYPE_LANGUAGE))
 
 static VALUE
-fontset_simple_initialize(self, lang)
-    VALUE self, lang;
+fontset_simple_initialize(VALUE self, VALUE lang)
 {
     G_INITIALIZE(self, pango_fontset_simple_new(RVAL2LANG(lang)));
     return Qnil;
 }
 
 static VALUE
-fontset_simple_append(self, font)
-    VALUE self, font;
+fontset_simple_append(VALUE self, VALUE font)
 {
     pango_fontset_simple_append(_SELF(self), PANGO_FONT(RVAL2GOBJ(font)));
     return self;
 }
 
 static VALUE
-fontset_simple_size(self)
-    VALUE self;
+fontset_simple_size(VALUE self)
 {
     return INT2NUM(pango_fontset_simple_size(_SELF(self)));
 }

data/ext/pango/rbpangoglyphinfo.c

@@ -39,31 +39,27 @@ pango_glyph_info_get_type(void)
 /**********************************/
 
 static VALUE
-gi_initialize(self)
-    VALUE self;
+gi_initialize(VALUE self)
 {
     G_INITIALIZE(self, g_new0(PangoGlyphInfo, 1));
     return Qnil;
 }
 
 static VALUE
-gi_glyph(self)
-    VALUE self;
+gi_glyph(VALUE self)
 {
     return UINT2NUM(_SELF(self)->glyph);
 }
 
 static VALUE
-gi_set_glyph(self, val)
-    VALUE self, val;
+gi_set_glyph(VALUE self, VALUE val)
 {
     _SELF(self)->glyph = NUM2UINT(val);
     return self;
 }
 
 static VALUE
-gi_geometry(self)
-    VALUE self;
+gi_geometry(VALUE self)
 {
     PangoGlyphGeometry geo = _SELF(self)->geometry;
 
@@ -72,8 +68,7 @@ gi_geometry(self)
 }
 
 static VALUE
-gi_set_geometry(self, width, x_offset, y_offset)
-    VALUE self;
+gi_set_geometry(VALUE self, VALUE width, VALUE x_offset, VALUE y_offset)
 {
     PangoGlyphGeometry geo = _SELF(self)->geometry;
 
@@ -88,15 +83,13 @@ gi_set_geometry(self, width, x_offset, y_offset)
   This method may be changed in the future following Pango implementation.
  */
 static VALUE
-gi_attr_is_cluster_start(self)
-    VALUE self;
+gi_attr_is_cluster_start(VALUE self)
 {
     return CBOOL2RVAL(_SELF(self)->attr.is_cluster_start);
 }
 
 static VALUE
-gi_attr_set_is_cluster_start(self, val)
-    VALUE self, val;
+gi_attr_set_is_cluster_start(VALUE self, VALUE val)
 {
     _SELF(self)->attr.is_cluster_start = RVAL2CBOOL(val);
     return self;

data/ext/pango/rbpangoglyphitem.c

@@ -17,8 +17,7 @@
 /**********************************/
 #ifndef HAVE_PANGO_GLYPH_ITEM_GET_TYPE
 static PangoGlyphItem*
-glyph_item_copy(ref)
-    const PangoGlyphItem* ref;
+glyph_item_copy(const PangoGlyphItem *ref)
 {
   PangoGlyphItem* new_ref;
   g_return_val_if_fail (ref != NULL, NULL);
@@ -54,32 +53,28 @@ pango_glyph_item_get_type(void)
 /**********************************/
 
 static VALUE
-glyph_item_get_item(self)
-    VALUE self;
+glyph_item_get_item(VALUE self)
 {
     PangoItem* item = _SELF(self)->item;
     return BOXED2RVAL(item, PANGO_TYPE_ITEM);
 }
 
 static VALUE
-glyph_item_get_glyphs(self)
-    VALUE self;
+glyph_item_get_glyphs(VALUE self)
 {
     PangoGlyphString* glyphs = _SELF(self)->glyphs;
     return BOXED2RVAL(glyphs, PANGO_TYPE_GLYPH_STRING);
 }
 
 static VALUE
-glyph_item_split(self, text, split_index)
-    VALUE self, text, split_index;
+glyph_item_split(VALUE self, VALUE text, VALUE split_index)
 {
     return BOXED2RVAL(pango_glyph_item_split(_SELF(self), RVAL2CSTR(text),
                                              NUM2INT(split_index)), PANGO_TYPE_GLYPH_ITEM);
 }
 
 static VALUE
-glyph_item_apply_attrs(self, text, attrs)
-    VALUE self, text, attrs;
+glyph_item_apply_attrs(VALUE self, VALUE text, VALUE attrs)
 {
     GSList* list = pango_glyph_item_apply_attrs(_SELF(self), RVAL2CSTR(text),
                                                 (PangoAttrList*)RVAL2BOXED(attrs, PANGO_TYPE_ATTR_LIST));
@@ -98,8 +93,7 @@ glyph_item_apply_attrs(self, text, attrs)
 
 #if PANGO_CHECK_VERSION(1,6,0)
 static VALUE
-glyph_item_letter_space(self, text, log_attrs, letter_spacing)
-    VALUE self, text, log_attrs, letter_spacing;
+glyph_item_letter_space(VALUE self, VALUE text, VALUE log_attrs, VALUE letter_spacing)
 {
     pango_glyph_item_letter_space(_SELF(self), RVAL2CSTR(text),
                                   (PangoLogAttr*)RVAL2BOXED(log_attrs, PANGO_TYPE_LOG_ATTR),

data/ext/pango/rbpangoglyphstring.c

@@ -14,26 +14,21 @@
 #define _SELF(self) ((PangoGlyphString*)(RVAL2BOXED(self, PANGO_TYPE_GLYPH_STRING)))
 
 static VALUE
-rglyph_initialize(self)
-    VALUE self;
+rglyph_initialize(VALUE self)
 {
     G_INITIALIZE(self, pango_glyph_string_new());
     return Qnil;
 }
 
 static VALUE
-rglyph_set_size(self, len)
-    VALUE self, len;
+rglyph_set_size(VALUE self, VALUE len)
 {
     pango_glyph_string_set_size(_SELF(self), NUM2INT(len));
     return self;
 }
 
 static VALUE
-rglyph_extents(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+rglyph_extents(int argc, VALUE *argv, VALUE self)
 {
     VALUE font, start_index, end_index;
     PangoRectangle ink_rect;
@@ -58,16 +53,14 @@ rglyph_extents(argc, argv, self)
 
 #if PANGO_CHECK_VERSION(1,14,0)
 static VALUE
-rglyph_get_width(self)
-    VALUE self;
+rglyph_get_width(VALUE self)
 {
     return INT2NUM(pango_glyph_string_get_width(_SELF(self)));
 }
 #endif
 
 static VALUE
-rglyph_index_to_x(self, text, analysis, index, trailing)
-    VALUE self, text, analysis, index, trailing;
+rglyph_index_to_x(VALUE self, VALUE text, VALUE analysis, VALUE index, VALUE trailing)
 {
     int x_pos;
     StringValue(text);
@@ -82,8 +75,7 @@ rglyph_index_to_x(self, text, analysis, index, trailing)
 }
 
 static VALUE
-rglyph_x_to_index(self, text, analysis, x_pos)
-    VALUE self, text, analysis, x_pos;
+rglyph_x_to_index(VALUE self, VALUE text, VALUE analysis, VALUE x_pos)
 {
     int index;
     int trailing;
@@ -98,8 +90,7 @@ rglyph_x_to_index(self, text, analysis, x_pos)
 }
 
 static VALUE
-rglyph_get_logical_widgths(self, text, embedding_level)
-    VALUE self, text, embedding_level;
+rglyph_get_logical_widgths(VALUE self, VALUE text, VALUE embedding_level)
 {
     int* logical_widths = NULL;
     int len, array_len, i;
@@ -126,8 +117,7 @@ rglyph_get_logical_widgths(self, text, embedding_level)
 }
 
 static VALUE
-rglyph_get_glyphs(self)
-    VALUE self;
+rglyph_get_glyphs(VALUE self)
 {
     int i;
     PangoGlyphInfo** glyphs = &_SELF(self)->glyphs;

data/ext/pango/rbpangoitem.c

@@ -15,14 +15,12 @@
 
 #define ATTR_INT(name)\
 static VALUE \
-item_int_ ## name (self)\
-    VALUE self;\
+item_int_ ## name (VALUE self)\
 {\
     return INT2NUM(_SELF(self)->name);\
 }\
 static VALUE \
-item_int_set_ ## name (self, val)\
-    VALUE self, val;\
+item_int_set_ ## name (VALUE self, VALUE val)\
 {\
     _SELF(self)->name = NUM2INT(val); \
     return self;\
@@ -49,16 +47,14 @@ pango_item_get_type(void)
 /**********************************/
 
 static VALUE
-item_initialize(self)
-    VALUE self;
+item_initialize(VALUE self)
 {
     G_INITIALIZE(self, pango_item_new());
     return Qnil;
 }
 
 static VALUE
-item_split(self, split_index, split_offset)
-    VALUE self, split_index, split_offset;
+item_split(VALUE self, VALUE split_index, VALUE split_offset)
 {
     return BOXED2RVAL(pango_item_split(_SELF(self), 
                                        NUM2INT(split_index), 
@@ -75,16 +71,14 @@ ATTR_INT(num_chars);
 
 
 static VALUE
-item_get_analysis(self)
-    VALUE self;
+item_get_analysis(VALUE self)
 {
     PangoAnalysis ana = _SELF(self)->analysis;
     return BOXED2RVAL(&ana, PANGO_TYPE_ANALYSIS);
 }
 
 static VALUE
-item_set_analysis(self, val)
-    VALUE self, val;
+item_set_analysis(VALUE self, VALUE val)
 {
     PangoAnalysis* ana = (PangoAnalysis*)RVAL2BOXED(val, PANGO_TYPE_ANALYSIS);
     _SELF(self)->analysis = *ana;

data/ext/pango/rbpangolanguage.c

@@ -22,25 +22,20 @@ language_s_default(VALUE self)
 }
 
 static VALUE
-language_initialize(self, language)
-    VALUE self, language;
+language_initialize(VALUE self, VALUE language)
 {
     G_INITIALIZE(self, pango_language_from_string(RVAL2CSTR(language)));
     return Qnil;
 }
 
 static VALUE
-language_s_to_string(self, language)
-    VALUE self, language;
+language_s_to_string(VALUE self, VALUE language)
 {
     return CSTR2RVAL(pango_language_to_string(RVAL2CSTR(language)));
 }
 
 static VALUE
-language_matches(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+language_matches(int argc, VALUE *argv, VALUE self)
 {
     VALUE range_list;
 
@@ -51,8 +46,7 @@ language_matches(argc, argv, self)
 }
 
 static VALUE
-language_to_str(self)
-    VALUE self;
+language_to_str(VALUE self)
 {
     return CSTR2RVAL(pango_language_to_string(_SELF(self)));
 }
@@ -60,8 +54,7 @@ language_to_str(self)
 #if PANGO_CHECK_VERSION(1,4,0)
 /* Moved from Pango::Script */
 static VALUE
-language_includes_script(self, script)
-    VALUE self, script;
+language_includes_script(VALUE self, VALUE script)
 {
     return CBOOL2RVAL(pango_language_includes_script(_SELF(self), 
                                                      RVAL2GENUM(script, PANGO_TYPE_SCRIPT)));

data/ext/pango/rbpangolayout.c

@@ -15,8 +15,7 @@
 #define RVAL2CONTEXT(v) (PANGO_CONTEXT(RVAL2GOBJ(v)))
 
 static VALUE
-layout_initialize(self, context)
-    VALUE self, context;
+layout_initialize(VALUE self, VALUE context)
 {
     G_INITIALIZE(self, pango_layout_new(RVAL2CONTEXT(context)));
     return Qnil;
@@ -29,40 +28,33 @@ layout_copy(VALUE self)
 }
 
 static VALUE
-layout_get_context(self)
-    VALUE self;
+layout_get_context(VALUE self)
 {
     return GOBJ2RVAL(pango_layout_get_context(_SELF(self)));
 }
 
 static VALUE
-layout_context_changed(self)
-    VALUE self;
+layout_context_changed(VALUE self)
 {
     pango_layout_context_changed(_SELF(self));
     return Qnil;
 }
 
 static VALUE
-layout_set_text(self, text)
-    VALUE self, text;
+layout_set_text(VALUE self, VALUE text)
 {
     pango_layout_set_text(_SELF(self), RVAL2CSTR(text), RSTRING_LEN(text));
     return self;
 }
 
 static VALUE
-layout_get_text(self)
-    VALUE self;
+layout_get_text(VALUE self)
 {
     return CSTR2RVAL(pango_layout_get_text(_SELF(self)));
 }
 
 static VALUE
-layout_set_markup(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+layout_set_markup(int argc, VALUE *argv, VALUE self)
 {
     VALUE markup, accel_marker;
     gunichar accel_char = 0;
@@ -83,16 +75,14 @@ layout_set_markup(argc, argv, self)
 }
 
 static VALUE
-layout_set_markup_eq(self, markup)
-    VALUE self, markup;
+layout_set_markup_eq(VALUE self, VALUE markup)
 {
     pango_layout_set_markup(_SELF(self), RVAL2CSTR(markup), RSTRING_LEN(markup));
     return markup;
 }
 
 static VALUE
-layout_set_attributes(self, attrs)
-    VALUE self, attrs;
+layout_set_attributes(VALUE self, VALUE attrs)
 {
     pango_layout_set_attributes(_SELF(self), 
                                 (PangoAttrList*)(RVAL2BOXED(attrs, PANGO_TYPE_ATTR_LIST)));
@@ -100,8 +90,7 @@ layout_set_attributes(self, attrs)
 }
 
 static VALUE
-layout_get_attributes(self)
-    VALUE self;
+layout_get_attributes(VALUE self)
 {
     return BOXED2RVAL(pango_layout_get_attributes(_SELF(self)), PANGO_TYPE_ATTR_LIST);
 }
@@ -129,8 +118,7 @@ layout_set_font_description(VALUE self, VALUE rb_desc)
 
 #ifdef HAVE_PANGO_LAYOUT_GET_FONT_DESCRIPTION
 static VALUE
-layout_get_font_description(self)
-    VALUE self;
+layout_get_font_description(VALUE self)
 {
     const PangoFontDescription* desc = pango_layout_get_font_description(_SELF(self));
     return BOXED2RVAL((gpointer)desc, PANGO_TYPE_FONT_DESCRIPTION);
@@ -138,130 +126,113 @@ layout_get_font_description(self)
 #endif
 
 static VALUE
-layout_set_width(self, width)
-    VALUE self, width;
+layout_set_width(VALUE self, VALUE width)
 {
     pango_layout_set_width(_SELF(self), NUM2INT(width));
     return self;
 }
 
 static VALUE
-layout_get_width(self)
-    VALUE self;
+layout_get_width(VALUE self)
 {
     return INT2NUM(pango_layout_get_width(_SELF(self)));
 }
 
 static VALUE
-layout_set_wrap(self, wrap)
-    VALUE self, wrap;
+layout_set_wrap(VALUE self, VALUE wrap)
 {
     pango_layout_set_wrap(_SELF(self), RVAL2GENUM(wrap, PANGO_TYPE_WRAP_MODE));
     return self;
 }
 
 static VALUE
-layout_get_wrap(self)
-    VALUE self;
+layout_get_wrap(VALUE self)
 {
     return GENUM2RVAL(pango_layout_get_wrap(_SELF(self)), PANGO_TYPE_WRAP_MODE);
 }
 
 #ifdef HAVE_PANGO_LAYOUT_SET_ELLIPSIZE
 static VALUE
-layout_set_ellipsize(self, ellipsize)
-    VALUE self, ellipsize;
+layout_set_ellipsize(VALUE self, VALUE ellipsize)
 {
     pango_layout_set_ellipsize(_SELF(self), RVAL2GENUM(ellipsize, 
                                                        PANGO_TYPE_ELLIPSIZE_MODE));
     return self;
 }
 static VALUE
-layout_get_ellipsize(self)
-    VALUE self;
+layout_get_ellipsize(VALUE self)
 {
     return GENUM2RVAL(pango_layout_get_ellipsize(_SELF(self)), PANGO_TYPE_ELLIPSIZE_MODE);
 }
 #endif
 
 static VALUE
-layout_set_indent(self, indent)
-    VALUE self, indent;
+layout_set_indent(VALUE self, VALUE indent)
 {
     pango_layout_set_indent(_SELF(self), NUM2INT(indent));
     return self;
 }
 
 static VALUE
-layout_get_indent(self)
-    VALUE self;
+layout_get_indent(VALUE self)
 {
     return INT2NUM(pango_layout_get_indent(_SELF(self)));
 }
 
 static VALUE
-layout_get_spacing(self)
-    VALUE self;
+layout_get_spacing(VALUE self)
 {
     return INT2NUM(pango_layout_get_spacing(_SELF(self)));
 }
 
 static VALUE
-layout_set_spacing(self, spacing)
-    VALUE self, spacing;
+layout_set_spacing(VALUE self, VALUE spacing)
 {
     pango_layout_set_spacing(_SELF(self), NUM2INT(spacing));
     return self;
 }
 
 static VALUE
-layout_set_justify(self, justify)
-    VALUE self, justify;
+layout_set_justify(VALUE self, VALUE justify)
 {
     pango_layout_set_justify(_SELF(self), RVAL2CBOOL(justify));
     return self;
 }
 static VALUE
-layout_get_justify(self)
-    VALUE self;
+layout_get_justify(VALUE self)
 {
     return CBOOL2RVAL(pango_layout_get_justify(_SELF(self)));
 }
 
 #if PANGO_CHECK_VERSION(1,4,0)
 static VALUE
-layout_set_auto_dir(self, auto_dir)
-    VALUE self, auto_dir;
+layout_set_auto_dir(VALUE self, VALUE auto_dir)
 {
     pango_layout_set_auto_dir(_SELF(self), RVAL2CBOOL(auto_dir));
     return self;
 }
 static VALUE
-layout_get_auto_dir(self)
-    VALUE self;
+layout_get_auto_dir(VALUE self)
 {
     return CBOOL2RVAL(pango_layout_get_auto_dir(_SELF(self)));
 }
 #endif
 
 static VALUE
-layout_set_alignment(self, align)
-    VALUE self, align;
+layout_set_alignment(VALUE self, VALUE align)
 {
     pango_layout_set_alignment(_SELF(self), RVAL2GENUM(align, PANGO_TYPE_ALIGNMENT));
     return self;
 }
 
 static VALUE
-layout_get_alignment(self)
-    VALUE self;
+layout_get_alignment(VALUE self)
 {
     return GENUM2RVAL(pango_layout_get_alignment(_SELF(self)), PANGO_TYPE_ALIGNMENT);
 }
 
 static VALUE
-layout_set_tabs(self, tabs)
-    VALUE self,tabs;
+layout_set_tabs(VALUE self, VALUE tabs)
 {
     pango_layout_set_tabs(_SELF(self), 
                           (PangoTabArray*)RVAL2BOXED(self, PANGO_TYPE_TAB_ARRAY));
@@ -269,8 +240,7 @@ layout_set_tabs(self, tabs)
 }
 
 static VALUE
-layout_get_tabs(self)
-    VALUE self;
+layout_get_tabs(VALUE self)
 {
     VALUE ret = Qnil;
     PangoTabArray* tabs = pango_layout_get_tabs(_SELF(self));
@@ -283,23 +253,20 @@ layout_get_tabs(self)
 }
 
 static VALUE
-layout_set_single_paragraph_mode(self, setting)
-    VALUE self, setting;
+layout_set_single_paragraph_mode(VALUE self, VALUE setting)
 {
     pango_layout_set_single_paragraph_mode(_SELF(self), RVAL2CBOOL(setting));
     return self;
 }
 
 static VALUE
-layout_get_single_paragraph_mode(self)
-    VALUE self;
+layout_get_single_paragraph_mode(VALUE self)
 {
     return CBOOL2RVAL(pango_layout_get_single_paragraph_mode(_SELF(self)));
 }
 
 static VALUE
-layout_get_log_attrs(self)
-    VALUE self;
+layout_get_log_attrs(VALUE self)
 {
     PangoLogAttr* attrs;
     gint i, n_attrs;
@@ -318,8 +285,7 @@ layout_get_log_attrs(self)
 }
 
 static VALUE
-layout_xy_to_index(self, x, y)
-    VALUE self, x, y;
+layout_xy_to_index(VALUE self, VALUE x, VALUE y)
 {
     int index, trailing;
     gboolean ret = pango_layout_xy_to_index(_SELF(self), 
@@ -330,8 +296,7 @@ layout_xy_to_index(self, x, y)
 }
 
 static VALUE
-layout_index_to_pos(self, index)
-    VALUE self, index;
+layout_index_to_pos(VALUE self, VALUE index)
 {
     PangoRectangle pos;
     pango_layout_index_to_pos(_SELF(self), NUM2INT(index), &pos);
@@ -339,8 +304,7 @@ layout_index_to_pos(self, index)
 }
 
 static VALUE
-layout_get_cursor_pos(self, index)
-    VALUE self, index;
+layout_get_cursor_pos(VALUE self, VALUE index)
 {
     PangoRectangle strong_pos, weak_pos;
     pango_layout_get_cursor_pos(_SELF(self), NUM2INT(index), &strong_pos, &weak_pos);
@@ -349,8 +313,7 @@ layout_get_cursor_pos(self, index)
 }
 
 static VALUE
-layout_move_cursor_visually(self, strong, old_index, old_trailing, direction)
-    VALUE self, strong, old_index, old_trailing, direction;
+layout_move_cursor_visually(VALUE self, VALUE strong, VALUE old_index, VALUE old_trailing, VALUE direction)
 {
     int new_index, new_trailing;
     pango_layout_move_cursor_visually(_SELF(self), RVAL2CBOOL(strong),
@@ -361,10 +324,7 @@ layout_move_cursor_visually(self, strong, old_index, old_trailing, direction)
 }
 
 static VALUE
-layout_get_extents(argc, argv, self)
-    int argc;
-    VALUE* argv;
-    VALUE self;
+layout_get_extents(int argc, VALUE *argv, VALUE self)
 {
     VALUE ink_rect, logical_rect;
     PangoRectangle rink, rlog;
@@ -403,8 +363,7 @@ layout_get_extents(argc, argv, self)
 }
 
 static VALUE
-layout_extents(self)
-    VALUE self;
+layout_extents(VALUE self)
 {
     PangoRectangle rink = {0, 0, 0, 0};
     PangoRectangle rlog = {0, 0, 0, 0};
@@ -415,10 +374,7 @@ layout_extents(self)
 }
 
 static VALUE
-layout_get_pixel_extents(argc, argv, self)
-    int argc;
-    VALUE* argv;
-    VALUE self;
+layout_get_pixel_extents(int argc, VALUE *argv, VALUE self)
 {
     VALUE ink_rect, logical_rect;
     PangoRectangle rink, rlog;
@@ -457,8 +413,7 @@ layout_get_pixel_extents(argc, argv, self)
 }
 
 static VALUE
-layout_pixel_extents(self)
-    VALUE self;
+layout_pixel_extents(VALUE self)
 {
     PangoRectangle rink = {0, 0, 0, 0};
     PangoRectangle rlog = {0, 0, 0, 0};
@@ -469,8 +424,7 @@ layout_pixel_extents(self)
 }
 
 static VALUE
-layout_get_size(self)
-    VALUE self;
+layout_get_size(VALUE self)
 {
     int width, height;
     pango_layout_get_size(_SELF(self), &width, &height);
@@ -478,8 +432,7 @@ layout_get_size(self)
 }
 
 static VALUE
-layout_get_pixel_size(self)
-    VALUE self;
+layout_get_pixel_size(VALUE self)
 {
     int width, height;
     pango_layout_get_pixel_size(_SELF(self), &width, &height);
@@ -487,30 +440,26 @@ layout_get_pixel_size(self)
 }
 
 static VALUE
-layout_get_line_count(self)
-    VALUE self;
+layout_get_line_count(VALUE self)
 {
     return INT2NUM(pango_layout_get_line_count(_SELF(self)));
 }
 
 static VALUE
-layout_get_line(self, line)
-    VALUE self, line;
+layout_get_line(VALUE self, VALUE line)
 {
     return BOXED2RVAL(pango_layout_get_line(_SELF(self), NUM2INT(line)), PANGO_TYPE_LAYOUT_LINE);
 }
 
 static VALUE
-layout_get_lines(self)
-    VALUE self;
+layout_get_lines(VALUE self)
 {
     return GSLIST2ARY2(pango_layout_get_lines(_SELF(self)), PANGO_TYPE_LAYOUT_LINE);
 }
 
 
 static VALUE
-layout_get_iter(self)
-    VALUE self;
+layout_get_iter(VALUE self)
 {
     return BOXED2RVAL(pango_layout_get_iter(_SELF(self)), 
                       PANGO_TYPE_LAYOUT_ITER);