Commit 767e3aa7 authored by Akira TAGOH's avatar Akira TAGOH

Fix compiler warnings

parent 706535e1
......@@ -47,7 +47,7 @@ retry_locale:
{
is_locale_initialized = FcTrue;
if (!fc_atomic_ptr_cmpexch (&static_is_locale_initialized, NULL,
(void *)(long) is_locale_initialized))
(void *)(intptr_t) is_locale_initialized))
goto retry_locale;
setlocale (LC_ALL, "");
}
......
......@@ -289,7 +289,9 @@ FcDirCacheScan (const FcChar8 *dir, FcConfig *config)
struct stat dir_stat;
const FcChar8 *sysroot = FcConfigGetSysRoot (config);
FcChar8 *d;
#ifndef _WIN32
int fd = -1;
#endif
if (sysroot)
d = FcStrBuildFilename (sysroot, dir, NULL);
......@@ -353,7 +355,9 @@ FcDirCacheRescan (const FcChar8 *dir, FcConfig *config)
FcStrSet *dirs;
const FcChar8 *sysroot = FcConfigGetSysRoot (config);
FcChar8 *d = NULL;
#ifndef _WIN32
int fd = -1;
#endif
cache = FcDirCacheLoad (dir, config, NULL);
if (!cache)
......
......@@ -1767,7 +1767,7 @@ FcFreeTypeQueryFaceInternal (const FT_Face face,
{
weight = FcIsWeight ((FcChar8 *) psfontinfo.weight);
if (FcDebug() & FC_DBG_SCANV)
printf ("\tType1 weight %s maps to %d\n",
printf ("\tType1 weight %s maps to %g\n",
psfontinfo.weight, weight);
}
......@@ -1845,7 +1845,7 @@ FcFreeTypeQueryFaceInternal (const FT_Face face,
{
weight = FcContainsWeight (style);
if (FcDebug() & FC_DBG_SCANV)
printf ("\tStyle %s maps to weight %d\n", style, weight);
printf ("\tStyle %s maps to weight %g\n", style, weight);
}
if (width == -1)
{
......
......@@ -46,7 +46,6 @@ comp(const FcChar8 *l1, const FcChar8 *l2)
int
main(void)
{
FcLangResult result;
int i = 1;
/* 1 */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment