diff options
| author | Ulrich Müller <ulm@gentoo.org> | 2012-01-30 17:48:40 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2012-01-30 17:48:40 +0000 |
| commit | ae57a6300677788caeb8dd2b008258b91fe16c47 (patch) | |
| tree | 7a5bb8549740df514277163a84abf23b7f59c37d | |
| parent | a5d426c371ba02f6065a19dd9707cf248df245d5 (diff) | |
| download | xine-lib-ae57a6300677788caeb8dd2b008258b91fe16c47.tar.gz xine-lib-ae57a6300677788caeb8dd2b008258b91fe16c47.tar.bz2 | |
Compile failure in osd.c with sys-libs/zlib-1.2.6
| -rw-r--r-- | misc/xine-fontconv.c | 4 | ||||
| -rw-r--r-- | src/xine-engine/osd.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/misc/xine-fontconv.c b/misc/xine-fontconv.c index 19b68c7f7..2eb8473cd 100644 --- a/misc/xine-fontconv.c +++ b/misc/xine-fontconv.c @@ -109,7 +109,7 @@ osd_fontchar_t fontchar; osd_font_t font; -static int gzwrite_i16(gzFile *fp, uint16_t number) { +static int gzwrite_i16(gzFile fp, uint16_t number) { return gzputc(fp, number & 0xFF) != -1 && gzputc(fp, (number >> 8) & 0xFF) != -1; } @@ -341,7 +341,7 @@ void render_font (FT_Face face, char *fontname, int size, int thickness, char filename[1024]; FT_Bitmap *out_bitmap; - gzFile *fp; + gzFile fp; int error; int error_counter; int glyph_index; diff --git a/src/xine-engine/osd.c b/src/xine-engine/osd.c index 1d22ea303..6914f6386 100644 --- a/src/xine-engine/osd.c +++ b/src/xine-engine/osd.c @@ -650,7 +650,7 @@ static void osd_set_position (osd_object_t *osd, int x, int y) { osd->display_y = y; } -static uint16_t gzread_i16(gzFile *fp) { +static uint16_t gzread_i16(gzFile fp) { uint16_t ret; ret = gzgetc(fp); ret |= (gzgetc(fp)<<8); @@ -663,7 +663,7 @@ static uint16_t gzread_i16(gzFile *fp) { static int osd_renderer_load_font(osd_renderer_t *this, char *filename) { - gzFile *fp; + gzFile fp; osd_font_t *font = NULL; int i, ret = 0; |