wm/afterstep/patches/patch-libAfterImage_asfont.c

   1 $NetBSD$
   2
   3 --- libAfterImage/asfont.c.orig 2008-08-15 21:47:37.000000000 +0000
   4 +++ libAfterImage/asfont.c
   5 @@ -367,7 +367,7 @@ release_font( ASFont *font )
   6         return res ;
   7  }
   8
   9 -static inline void
  10 +static void
  11  free_glyph_data( register ASGlyph *asg )
  12  {
  13      if( asg->pixmap )
  14 @@ -1268,7 +1268,7 @@ load_freetype_glyphs( ASFont *font )
  15  }
  16  #endif
  17
  18 -static inline ASGlyph *get_unicode_glyph( const UNICODE_CHAR uc, ASFont *font )
  19 +static ASGlyph *get_unicode_glyph( const UNICODE_CHAR uc, ASFont *font )
  20  {
  21         register ASGlyphRange *r;
  22         ASGlyph *asg = NULL ;
  23 @@ -1300,7 +1300,7 @@ LOCAL_DEBUG_OUT( "%sFound glyph for char
  24  }
  25
  26
  27 -static inline ASGlyph *get_character_glyph( const unsigned char c, ASFont *font )
  28 +static ASGlyph *get_character_glyph( const unsigned char c, ASFont *font )
  29  {
  30         return get_unicode_glyph( CHAR2UNICODE(c), font );
  31  }
  32 @@ -1368,7 +1368,7 @@ utf8_to_unicode ( const unsigned char *s
  33      return 0;
  34  }
  35
  36 -static inline ASGlyph *get_utf8_glyph( const char *utf8, ASFont *font )
  37 +static ASGlyph *get_utf8_glyph( const char *utf8, ASFont *font )
  38  {
  39         UNICODE_CHAR uc = utf8_to_unicode ( (const unsigned char*)utf8 );
  40         LOCAL_DEBUG_OUT( "translated to Unicode 0x%lX(%ld), UTF8 size = %d", uc, uc, UTF8_CHAR_SIZE(utf8[0]) );
  41 @@ -1773,7 +1773,7 @@ get_fancy_text_size( const void *src_tex
  42         return get_text_size_internal( src_text, font, &internal_attr, width, height, length, x_positions );
  43  }
  44
  45 -inline static void
  46 +static void
  47  render_asglyph( CARD8 **scanlines, CARD8 *row,
  48                  int start_x, int y, int width, int height,
  49                                 CARD32 ratio )
  50 @@ -1812,7 +1812,7 @@ render_asglyph( CARD8 **scanlines, CARD8
  51         }
  52  }
  53
  54 -inline static void
  55 +static void
  56  render_asglyph_over( CARD8 **scanlines, CARD8 *row,
  57                  int start_x, int y, int width, int height,
  58                                 CARD32 value )