From c168d9641ce8c2eccbc405ac0f38020a0acf90dc Mon Sep 17 00:00:00 2001
From: DRC <dcommander@users.sourceforge.net>
Date: Sun, 6 Jan 2013 18:00:20 +0000
Subject: [PATCH] Prevent compiler warning on Windows if jmorecfg.h is included
 after the Windows headers, which also define FAR.

git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.2.x@892 632fc199-4ca6-4c93-a231-07263d6284db
---
 jmorecfg.h | 3 +++
 1 file changed, 3 insertions(+)

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
 
-- 
2.40.0