diff options
| author | marha <marha@users.sourceforge.net> | 2015-06-15 21:36:28 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-06-15 21:36:28 +0200 |
| commit | 008a8d8051786badb83e455bd9281103ba9a6470 (patch) | |
| tree | f99ea672d105271cb60a726fac8022ce47ea2866 /freetype/src/tools/apinames.c | |
| parent | 912e881bec8b16f2331225960645c3bdf5a8ba2d (diff) | |
| parent | e8d5e7c4bb11f7fcb0a4ba5c13f43e7929849a2f (diff) | |
| download | vcxsrv-008a8d8051786badb83e455bd9281103ba9a6470.tar.gz vcxsrv-008a8d8051786badb83e455bd9281103ba9a6470.tar.bz2 vcxsrv-008a8d8051786badb83e455bd9281103ba9a6470.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
freetype/src/base/ftfntfmt.c
freetype/src/cache/ftcimage.c
freetype/src/cid/cidriver.c
freetype/src/truetype/ttdriver.c
mesalib/src/mesa/drivers/dri/common/dri_util.c
mesalib/src/mesa/drivers/dri/swrast/swrast.c
openssl/Makefile
Diffstat (limited to 'freetype/src/tools/apinames.c')
| -rw-r--r-- | freetype/src/tools/apinames.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/freetype/src/tools/apinames.c b/freetype/src/tools/apinames.c index c85df721a..9f81b1a6c 100644 --- a/freetype/src/tools/apinames.c +++ b/freetype/src/tools/apinames.c @@ -10,7 +10,7 @@ * accepted if you are using GCC for compilation (and probably by * other compilers too). * - * Author: David Turner, 2005, 2006, 2008-2013 + * Author: David Turner, 2005, 2006, 2008-2013, 2015 * * This code is explicitly placed into the public domain. * @@ -156,6 +156,7 @@ names_dump( FILE* out, case OUTPUT_WATCOM_LBC: { const char* dot; + char temp[512]; if ( dll_name == NULL ) @@ -169,8 +170,7 @@ names_dump( FILE* out, dot = strchr( dll_name, '.' ); if ( dot != NULL ) { - char temp[512]; - int len = dot - dll_name; + int len = dot - dll_name; if ( len > (int)( sizeof ( temp ) - 1 ) ) |