From: Sven Hoexter <sven@timegate.de>
Date: Sun, 12 Aug 2012 17:27:31 +0000 (+0200)
Subject: Merge 0.9.8 from upstream
X-Git-Tag: debian/0.9.8-1~4
X-Git-Url: http://git.sven.stormbind.net/?p=sven%2Ffuse-exfat.git;a=commitdiff_plain;h=4b5aca8e537ecaacb08737f28398bd8a8ab319d5;hp=-c

Merge 0.9.8 from upstream
---

4b5aca8e537ecaacb08737f28398bd8a8ab319d5
diff --combined libexfat/io.c
index c9c1e2b,f0beddc..8e9de8c
--- a/libexfat/io.c
+++ b/libexfat/io.c
@@@ -2,7 -2,7 +2,7 @@@
  	io.c (02.09.09)
  	exFAT file system implementation library.
  
- 	Copyright (C) 2009, 2010  Andrew Nayenko
+ 	Copyright (C) 2010-2012  Andrew Nayenko
  
  	This program is free software: you can redistribute it and/or modify
  	it under the terms of the GNU General Public License as published by
@@@ -18,7 -18,6 +18,7 @@@
  	along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
  
 +#define _XOPEN_SOURCE 500 /* for pread() and pwrite() in Linux */
  #include "exfat.h"
  #include <inttypes.h>
  #include <sys/types.h>
@@@ -32,7 -31,7 +32,7 @@@
  #include <ublio.h>
  #endif
  
- #if _FILE_OFFSET_BITS != 64
+ #if !defined(_FILE_OFFSET_BITS) || (_FILE_OFFSET_BITS != 64)
  	#error You should define _FILE_OFFSET_BITS=64
  #endif