Trying to get it to build without Pango.

This commit is contained in:
William Kendrick 2010-02-02 23:40:53 +00:00
parent 2697ff0015
commit 6e6ee1f8a3
2 changed files with 3 additions and 0 deletions

View file

@ -235,6 +235,7 @@ TuxPaint_Font *load_locale_font(TuxPaint_Font * fallback, int size)
} }
#endif #endif
#ifndef NO_SDLPANGO
if (!ret) if (!ret)
{ {
ret = try_alternate_font(size); ret = try_alternate_font(size);
@ -254,6 +255,7 @@ TuxPaint_Font *load_locale_font(TuxPaint_Font * fallback, int size)
} }
} }
} }
#endif
return ret ? ret : fallback; return ret ? ret : fallback;
} }
#endif #endif

View file

@ -106,6 +106,7 @@ 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, const char *restrict const locale); void run_font_scanner(SDL_Surface * screen, const char *restrict const locale);
void receive_some_font_info(SDL_Surface * screen); void receive_some_font_info(SDL_Surface * screen);
#endif #endif