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+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.3.x@1258 632fc199-4ca6-4c93-a231-07263d6284db
diff --git a/jdmerge.c b/jdmerge.c
index 9830be2..cb1aa0a 100644
--- a/jdmerge.c
+++ b/jdmerge.c
@@ -39,7 +39,7 @@
#include "jinclude.h"
#include "jpeglib.h"
#include "jsimd.h"
-#include "config.h"
+#include "jconfigint.h"
#ifdef UPSAMPLE_MERGING_SUPPORTED