diff options
| author | marha <marha@users.sourceforge.net> | 2013-06-28 16:49:07 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-06-28 16:49:07 +0200 |
| commit | 3c204c4a20943586532ce477ced827d108f3b4b0 (patch) | |
| tree | c9891fdc315c41cc90806634589231172572b2ba /fontconfig/src/fcobjs.c | |
| parent | 73a26452133415b7e3bf54836d23995d59a7bac4 (diff) | |
| parent | ced1a6b8f5a750fcd3b8d3d0d9bbdee830064e6c (diff) | |
| download | vcxsrv-3c204c4a20943586532ce477ced827d108f3b4b0.tar.gz vcxsrv-3c204c4a20943586532ce477ced827d108f3b4b0.tar.bz2 vcxsrv-3c204c4a20943586532ce477ced827d108f3b4b0.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa git update 28 June 2013
libXext mesa git update 29 June 20013
Diffstat (limited to 'fontconfig/src/fcobjs.c')
| -rw-r--r-- | fontconfig/src/fcobjs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fontconfig/src/fcobjs.c b/fontconfig/src/fcobjs.c index 146ca70d0..1d3af73be 100644 --- a/fontconfig/src/fcobjs.c +++ b/fontconfig/src/fcobjs.c @@ -63,7 +63,7 @@ retry: return NULL; ot->object.object = (const char *) FcStrdup (str); - ot->object.type = -1; + ot->object.type = FcTypeUnknown; ot->id = fc_atomic_int_add (next_id, +1); ot->next = ots; |