From: resver <resver@60bc1c72-a15a-11de-b98f-4500b42dc123>
Date: Fri, 18 May 2012 15:52:30 +0000 (+0000)
Subject: Define FUSE_USE_VERSION only before inclusion of fuse.h, no need to define it globally.
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3a253335c6d265ceb418a37c65efdf1f82216ac7;p=android-x86%2Fexternal-exfat.git

Define FUSE_USE_VERSION only before inclusion of fuse.h, no need to define it globally.

git-svn-id: http://exfat.googlecode.com/svn/trunk@287 60bc1c72-a15a-11de-b98f-4500b42dc123
---

diff --git a/SConstruct b/SConstruct
index 9da3f30..f427de1 100644
--- a/SConstruct
+++ b/SConstruct
@@ -41,7 +41,6 @@ if not conf.env['CCFLAGS']:
 		conf.env.Replace(CCFLAGS = '-Wall -O2 -g')
 if 'CPPFLAGS' in os.environ:
 	conf.env.Replace(CPPFLAGS = os.environ['CPPFLAGS'])
-conf.env.Append(CPPDEFINES = {'FUSE_USE_VERSION': 26})
 conf.env.Append(CPPDEFINES = {'_FILE_OFFSET_BITS' : 64})
 conf.env.Append(CPPPATH = ['libexfat'])
 if 'LDFLAGS' in os.environ:
diff --git a/fuse/main.c b/fuse/main.c
index 2be54e2..643df3f 100644
--- a/fuse/main.c
+++ b/fuse/main.c
@@ -18,6 +18,7 @@
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#define FUSE_USE_VERSION 26
 #include <fuse.h>
 #include <errno.h>
 #include <fcntl.h>