aboutsummaryrefslogtreecommitdiff
path: root/jccolor.c
diff options
context:
space:
mode:
authordcommander <dcommander@632fc199-4ca6-4c93-a231-07263d6284db>2014-04-20 09:13:37 +0000
committerdcommander <dcommander@632fc199-4ca6-4c93-a231-07263d6284db>2014-04-20 09:13:37 +0000
commitdc8cd84714f548189a1b2dd27eced9e6239df7f3 (patch)
treec742c4579ed3cd2c7a24237dc89cbd44736130ce /jccolor.c
parent6d319800652594cb8289acbde2c8ef236e075cfb (diff)
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
Diffstat (limited to 'jccolor.c')
-rw-r--r--jccolor.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/jccolor.c b/jccolor.c
index 94b4184..8318485 100644
--- a/jccolor.c
+++ b/jccolor.c
@@ -15,7 +15,7 @@
#include "jinclude.h"
#include "jpeglib.h"
#include "jsimd.h"
-#include "config.h"
+#include "jconfigint.h"
/* Private subobject */