aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordcommander <dcommander@632fc199-4ca6-4c93-a231-07263d6284db>2013-01-06 17:59:42 +0000
committerdcommander <dcommander@632fc199-4ca6-4c93-a231-07263d6284db>2013-01-06 17:59:42 +0000
commitd2bfb3dac54ef2e9a0d06a82785f0e8f364676dd (patch)
tree82ff48e770330de2988c57353adf44d2917655d8
parentf04ce7ccca6c9b81130b5ca8de3a9250897b59c6 (diff)
Prevent compiler warning on Windows if jmorecfg.h is included after the Windows headers, which also define FAR.
git-svn-id: svn://svn.code.sf.net/p/libjpeg-turbo/code/trunk@891 632fc199-4ca6-4c93-a231-07263d6284db
-rw-r--r--jmorecfg.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/jmorecfg.h b/jmorecfg.h
index b5e98b5..55af056 100644
--- a/jmorecfg.h
+++ b/jmorecfg.h
@@ -212,8 +212,11 @@ typedef unsigned int JDIMENSION;
*/
#ifdef NEED_FAR_POINTERS
+#ifndef FAR
#define FAR far
+#endif
#else
+#undef FAR
#define FAR
#endif