Compiler warnings

This commit is contained in:
Pere Pujal i Carabantes 2017-12-19 02:41:42 +01:00
commit de308f70a8
3 changed files with 381 additions and 463 deletions

View file

@ -1,7 +1,7 @@
/* /*
fonts.c fonts.c
Copyright (c) 2009-2014 Copyright (c) 2009-2017
http://www.tuxpaint.org/ http://www.tuxpaint.org/
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
@ -157,6 +157,10 @@ unsigned text_size = 4; // initial text size
int button_label_y_nudge; int button_label_y_nudge;
#ifdef FORKED_FONTS
static void reliable_read(int fd, void *buf, size_t count);
#endif
#ifndef NO_SDLPANGO #ifndef NO_SDLPANGO
static TuxPaint_Font *try_alternate_font(int size) static TuxPaint_Font *try_alternate_font(int size)

View file

@ -1,7 +1,7 @@
/* /*
fonts.h fonts.h
Copyright (c) 2009-2014 Copyright (c) 2009-2017
http://www.tuxpaint.org/ http://www.tuxpaint.org/
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
@ -115,8 +115,8 @@ int TuxPaint_Font_FontHeight(TuxPaint_Font * tpf);
#ifdef FORKED_FONTS #ifdef FORKED_FONTS
void reliable_write(int fd, const void *buf, size_t count); void reliable_write(int fd, const void *buf, size_t count);
static void reliable_read(int fd, void *buf, size_t count); void run_font_scanner(SDL_Surface * screen, SDL_Texture * texture, SDL_Renderer * renderer,
void run_font_scanner(SDL_Surface * screen, SDL_Texture * texture, SDL_Renderer * renderer, const char *restrict const locale); const char *restrict const locale);
void receive_some_font_info(SDL_Surface * screen, SDL_Texture * texture, SDL_Renderer * renderer); void receive_some_font_info(SDL_Surface * screen, SDL_Texture * texture, SDL_Renderer * renderer);
#endif #endif
@ -196,6 +196,7 @@ TuxPaint_Font *load_locale_font(TuxPaint_Font * fallback, int size);
void sdl_color_to_pango_color(SDL_Color sdl_color, SDLPango_Matrix * pango_color); void sdl_color_to_pango_color(SDL_Color sdl_color, SDLPango_Matrix * pango_color);
#endif #endif
int load_user_fonts(SDL_Surface * screen, SDL_Texture * texture, SDL_Renderer * renderer, void *vp, const char *restrict const locale); int load_user_fonts(SDL_Surface * screen, SDL_Texture * texture, SDL_Renderer * renderer, void *vp,
const char *restrict const locale);
#endif #endif

File diff suppressed because it is too large Load diff