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/fc-cat | |
| 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/fc-cat')
| -rw-r--r-- | fontconfig/fc-cat/Makefile.am | 2 | ||||
| -rw-r--r-- | fontconfig/fc-cat/fc-cat.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/fontconfig/fc-cat/Makefile.am b/fontconfig/fc-cat/Makefile.am index 7b52d49b6..b426723ba 100644 --- a/fontconfig/fc-cat/Makefile.am +++ b/fontconfig/fc-cat/Makefile.am @@ -56,3 +56,5 @@ CLEANFILES += ${man_MANS} else all-local: endif + +-include $(top_srcdir)/git.mk diff --git a/fontconfig/fc-cat/fc-cat.c b/fontconfig/fc-cat/fc-cat.c index 72912b798..9a2abb3fa 100644 --- a/fontconfig/fc-cat/fc-cat.c +++ b/fontconfig/fc-cat/fc-cat.c @@ -67,17 +67,15 @@ extern int optind, opterr, optopt; #endif /* - * POSIX has broken stdio so that getc must do thread-safe locking, + * POSIX has broken stdio so that putc must do thread-safe locking, * this is a serious performance problem for applications doing large - * amounts of IO with getc (as is done here). If available, use - * the getc_unlocked varient instead. + * amounts of IO with putc (as is done here). If available, use + * the putc_unlocked varient instead. */ -#if defined(getc_unlocked) || defined(_IO_getc_unlocked) -#define GETC(f) getc_unlocked(f) +#if defined(putc_unlocked) || defined(_IO_putc_unlocked) #define PUTC(c,f) putc_unlocked(c,f) #else -#define GETC(f) getc(f) #define PUTC(c,f) putc(c,f) #endif |