diff options
| author | marha <marha@users.sourceforge.net> | 2012-05-29 09:42:05 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-05-29 09:42:05 +0200 |
| commit | 64385e98e48e5d44d0d5a8923fc9f7049e4ea7ab (patch) | |
| tree | daa5b4bcb52d4944a87a0c62462121470271bd2d /fontconfig | |
| parent | 929f6074f546df3f73565d42f422b018db615a33 (diff) | |
| download | vcxsrv-64385e98e48e5d44d0d5a8923fc9f7049e4ea7ab.tar.gz vcxsrv-64385e98e48e5d44d0d5a8923fc9f7049e4ea7ab.tar.bz2 vcxsrv-64385e98e48e5d44d0d5a8923fc9f7049e4ea7ab.zip | |
fontconfig: solved compile warnings and link errors.
Diffstat (limited to 'fontconfig')
| -rw-r--r-- | fontconfig/src/fcstat.c | 2 | ||||
| -rw-r--r-- | fontconfig/src/fcxml.c | 3 | ||||
| -rw-r--r-- | fontconfig/src/makefile | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/fontconfig/src/fcstat.c b/fontconfig/src/fcstat.c index c2d9fe9ee..0c15f8700 100644 --- a/fontconfig/src/fcstat.c +++ b/fontconfig/src/fcstat.c @@ -218,7 +218,7 @@ static int FcFStatFs (int fd, FcStatFS *statb) { const char *p = NULL; - int ret; + int ret=0; FcBool flag = FcFalse; memset (statb, 0, sizeof (FcStatFS)); diff --git a/fontconfig/src/fcxml.c b/fontconfig/src/fcxml.c index e6fdf7f7e..799352e6f 100644 --- a/fontconfig/src/fcxml.c +++ b/fontconfig/src/fcxml.c @@ -1850,7 +1850,8 @@ FcParseDir (FcConfigParse *parse) #ifdef _WIN32 FcChar8 buffer[MAX_PATH]; #endif - const FcChar8 *attr, *data; + const FcChar8 *attr; + FcChar8 *data; FcChar8 *prefix = NULL; attr = FcConfigGetAttribute (parse, "prefix"); diff --git a/fontconfig/src/makefile b/fontconfig/src/makefile index f27d62fa5..a289c5f6e 100644 --- a/fontconfig/src/makefile +++ b/fontconfig/src/makefile @@ -33,6 +33,7 @@ CSRCS = \ fcname.c \ fcpat.c \ fcserialize.c \ + fcstat.c \ fcstr.c \ fcxml.c \ \ |