am 05aaabf9: reconcile main tree with open-source eclair

Merge commit '05aaabf91b5c4ac039bf721fd02d6817e7d404be' into eclair-plus-aosp

* commit '05aaabf91b5c4ac039bf721fd02d6817e7d404be':
  android-2.1_r1 snapshot
diff --git a/yaffs2/devextras.h b/yaffs2/devextras.h
index 12f2200..5c495e3 100644
--- a/yaffs2/devextras.h
+++ b/yaffs2/devextras.h
@@ -37,7 +37,7 @@
 typedef unsigned short __u16;
 typedef unsigned __u32;
 
-#if defined(__APPLE__)
+#if defined(__APPLE__) || defined(__FreeBSD__)
 typedef long long loff_t;
 #endif