From dc8cd84714f548189a1b2dd27eced9e6239df7f3 Mon Sep 17 00:00:00 2001 From: dcommander Date: Sun, 20 Apr 2014 09:13:37 +0000 Subject: This patch accomplishes the following: -- Auto-generates HAVE_LOCALE_H macro and adds it to jconfig.h (this is used by rdjpgcom.c.) -- Reconciles the description and ordering of macros between config.h.in and jconfig.h.in, so the two files can be easily diffed. -- Eliminates the use of the autoheader-generated config.h in the project and moves relevant internal-only macros into a new file, jconfigint.h. This is to avoid "already defined" warnings in files that were including both config.h (to get the internal autotools package information or the INLINE definition) and jconfig.h. git-svn-id: svn://svn.code.sf.net/p/libjpeg-turbo/code/trunk@1257 632fc199-4ca6-4c93-a231-07263d6284db --- jpegtran.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'jpegtran.c') diff --git a/jpegtran.c b/jpegtran.c index 54c8ece..5bfab48 100644 --- a/jpegtran.c +++ b/jpegtran.c @@ -16,7 +16,7 @@ #include "cdjpeg.h" /* Common decls for cjpeg/djpeg applications */ #include "transupp.h" /* Support routines for jpegtran */ #include "jversion.h" /* for version message */ -#include "config.h" +#include "jconfigint.h" #ifdef USE_CCOMMAND /* command-line reader for Macintosh */ #ifdef __MWERKS__ @@ -375,7 +375,7 @@ main (int argc, char **argv) jvirt_barray_ptr * dst_coef_arrays; int file_index; /* We assume all-in-memory processing and can therefore use only a - * single file pointer for sequential input and output operation. + * single file pointer for sequential input and output operation. */ FILE * fp; -- cgit v1.2.3