diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-07 11:56:06 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-07 11:56:06 +0100 |
| commit | 3f553aaceddc9b09363c73d9bea40eaea8164fc4 (patch) | |
| tree | b112d1ad761f8621106f8930daaf97fafed339fb /fontconfig/fontconfig | |
| parent | 293fd0043af7e861c9c540bebc44630d0da0bf9b (diff) | |
| download | vcxsrv-3f553aaceddc9b09363c73d9bea40eaea8164fc4.tar.gz vcxsrv-3f553aaceddc9b09363c73d9bea40eaea8164fc4.tar.bz2 vcxsrv-3f553aaceddc9b09363c73d9bea40eaea8164fc4.zip | |
pixman xkbcomp libX11 libXau mesa fontconfig xserver xkeyboard-config git update 7 jan 2013
fontconfig: 17eda89ed2e24a3fc5f68538dd7fd9ada8efb087
xserver: bd91b05b631f13afd1f7a9d6cbc4f0c5408b523a
xkeyboard-config: 4779e2745094ebe0c06364b4099d7067ae750d07
libX11: cd25cab4b5b957641183ce72dd1ae0424aff1663
libXau: e04364efccbb3bb4cfc5f4cb491ffa1faaaacbdb
mesa: afec10df373f342f058aab66c622237964a4a147
pixman: 35cc965514ca6e665c18411fcf66db826d559c2a
xkbcomp: e4f767913338052527538d429931e8abd8c3fb88
Diffstat (limited to 'fontconfig/fontconfig')
| -rw-r--r-- | fontconfig/fontconfig/Makefile.am | 2 | ||||
| -rw-r--r-- | fontconfig/fontconfig/fontconfig.h | 18 |
2 files changed, 13 insertions, 7 deletions
diff --git a/fontconfig/fontconfig/Makefile.am b/fontconfig/fontconfig/Makefile.am index 72fec336e..99bb4c3b2 100644 --- a/fontconfig/fontconfig/Makefile.am +++ b/fontconfig/fontconfig/Makefile.am @@ -6,3 +6,5 @@ fontconfig_headers= \ fcprivate.h fontconfiginclude_HEADERS = $(fontconfig_headers) + +-include $(top_srcdir)/git.mk diff --git a/fontconfig/fontconfig/fontconfig.h b/fontconfig/fontconfig/fontconfig.h index 266986c87..1af63abfb 100644 --- a/fontconfig/fontconfig/fontconfig.h +++ b/fontconfig/fontconfig/fontconfig.h @@ -181,10 +181,10 @@ typedef int FcBool; #define FC_LCD_LEGACY 3 typedef enum _FcType { - FcTypeVoid, - FcTypeInteger, - FcTypeDouble, - FcTypeString, + FcTypeVoid, + FcTypeInteger, + FcTypeDouble, + FcTypeString, FcTypeBool, FcTypeMatrix, FcTypeCharSet, @@ -424,7 +424,7 @@ FcCharSetCreate (void); /* deprecated alias for FcCharSetCreate */ FcPublic FcCharSet * FcCharSetNew (void); - + FcPublic void FcCharSetDestroy (FcCharSet *fcs); @@ -734,21 +734,25 @@ FcMatrixShear (FcMatrix *m, double sh, double sv); /* fcname.c */ +/* Deprecated. Does nothing. Returns FcFalse. */ FcPublic FcBool FcNameRegisterObjectTypes (const FcObjectType *types, int ntype); +/* Deprecated. Does nothing. Returns FcFalse. */ FcPublic FcBool FcNameUnregisterObjectTypes (const FcObjectType *types, int ntype); - + FcPublic const FcObjectType * FcNameGetObjectType (const char *object); +/* Deprecated. Does nothing. Returns FcFalse. */ FcPublic FcBool FcNameRegisterConstants (const FcConstant *consts, int nconsts); +/* Deprecated. Does nothing. Returns FcFalse. */ FcPublic FcBool FcNameUnregisterConstants (const FcConstant *consts, int nconsts); - + FcPublic const FcConstant * FcNameGetConstant (const FcChar8 *string); |