libXfont: Changes to 'master'

[Keith Packard]

 include/X11/fonts/fntfil.h   |   14 +++++++-------
 include/X11/fonts/fontmisc.h |    2 +-
 src/FreeType/ftfuncs.c       |    2 ++
 src/bitmap/bitscale.c        |    4 ++--
 src/builtins/builtin.h       |    4 ++--
 src/builtins/dir.c           |    2 +-
 src/builtins/file.c          |    2 +-
 src/builtins/fpe.c           |    2 +-
 src/fc/fsconvert.c           |    2 +-
 src/fc/fserve.c              |   18 +++++++++---------
 src/fc/fserve.h              |    2 +-
 src/fontfile/catalogue.c     |   26 ++++++++++++++------------
 src/fontfile/dirfile.c       |    4 +++-
 src/fontfile/fontfile.c      |   16 ++++++++--------
 src/util/patcache.c          |   14 +++++++-------
 15 files changed, 60 insertions(+), 54 deletions(-)

New commits:
commit a96cc1f032a059da89319ceccb6659c8edd446fb
Author: Keith Packard <keithp at keithp.com>
Date:   Fri Nov 15 21:46:15 2013 +0900

    Warning fixes.
    
    Many const char issues.
    
    One extra 'i' declared in ScaleFont; we can just use the same 'i' as
    exists at the top level scope.
    
    Also ignore bad-function-cast in ftfuncs.c and bitscale.c because
    we're casting the return value from floor or ceil from double to
    int. As floor and ceil are kinda designed to generate integer results,
    it's pretty clear that we're doing what we want and that the compiler
    is generating noise. I'm not sure why bad-function-cast is ever a good
    warning to turn on, but I'll leave that for another day.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>
    Reviewed-by: Gaetan Nadon <memsize at videotron.ca>