Include config.h to ensure that HAVE_UNISTD_H exists. Fix inline usage.

5 files changed, 55 insertions, 1 deletions

diff --git a/filesystems/fuse-ext2/distinfo b/filesystems/fuse-ext2/distinfo
index cbf382892b6..e4f493e03a5 100644
--- a/filesystems/fuse-ext2/distinfo
+++ b/filesystems/fuse-ext2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2012/05/10 10:49:49 wiz Exp $
+$NetBSD: distinfo,v 1.4 2012/12/20 21:54:24 joerg Exp $
 
 SHA1 (fuse-ext2-0.0.7.tar.gz) = cdfef525838d2de07a4da6d60b65efce5a1cffa0
 RMD160 (fuse-ext2-0.0.7.tar.gz) = 29cb85f033b65fba4d82d14de907dd4458173c2b
@@ -8,3 +8,7 @@ SHA1 (patch-ab) = 830bc968c55b13125700a6fbeff9808610d065f0
 SHA1 (patch-ac) = 253561f1e6a67b5d66d7409af3bf26477ad57b2c
 SHA1 (patch-af) = ced88c0a278c4924ee9fb6585271093742f0eb09
 SHA1 (patch-ag) = 93c6b2f3d0be517a3bfb4e5aaf198fbf782ab10c
+SHA1 (patch-e2fsprogs-1.41.9_ext2fs_bitops.h) = 61b1e0258e55c7639ee4e8228ce576488b4f40e3
+SHA1 (patch-e2fsprogs-1.41.9_ext2fs_ext2fs.h) = 2377307af7b081d84e4097f88e7aa10086a45781
+SHA1 (patch-e2fsprogs-1.41.9_ext2fs_icount.c) = f00b80bb633e46589a39bc8972e5c136f3f6e0a9
+SHA1 (patch-e2fsprogs-1.41.9_ext2fs_test__io.c) = 49c14b89229cf08789ff91bcdb1ecdd26239d809
diff --git a/filesystems/fuse-ext2/patches/patch-e2fsprogs-1.41.9_ext2fs_bitops.h b/filesystems/fuse-ext2/patches/patch-e2fsprogs-1.41.9_ext2fs_bitops.h
new file mode 100644
index 00000000000..3b9bd115930
--- /dev/null
+++ b/filesystems/fuse-ext2/patches/patch-e2fsprogs-1.41.9_ext2fs_bitops.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-e2fsprogs-1.41.9_ext2fs_bitops.h,v 1.1 2012/12/20 21:54:24 joerg Exp $
+
+--- e2fsprogs-1.41.9/ext2fs/bitops.h.orig	2009-10-19 13:17:52.000000000 +0000
++++ e2fsprogs-1.41.9/ext2fs/bitops.h
+@@ -139,7 +139,7 @@ extern __u32 ext2fs_get_generic_bitmap_e
+ #define _INLINE_ extern
+ #else
+ #ifdef __GNUC__
+-#define _INLINE_ extern __inline__
++#define _INLINE_ extern __attribute__((__gnu_inline__)) __inline__
+ #else				/* For Watcom C */
+ #define _INLINE_ extern inline
+ #endif
diff --git a/filesystems/fuse-ext2/patches/patch-e2fsprogs-1.41.9_ext2fs_ext2fs.h b/filesystems/fuse-ext2/patches/patch-e2fsprogs-1.41.9_ext2fs_ext2fs.h
new file mode 100644
index 00000000000..a7d5a72a7e0
--- /dev/null
+++ b/filesystems/fuse-ext2/patches/patch-e2fsprogs-1.41.9_ext2fs_ext2fs.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-e2fsprogs-1.41.9_ext2fs_ext2fs.h,v 1.1 2012/12/20 21:54:24 joerg Exp $
+
+--- e2fsprogs-1.41.9/ext2fs/ext2fs.h.orig	2012-12-20 13:55:15.000000000 +0000
++++ e2fsprogs-1.41.9/ext2fs/ext2fs.h
+@@ -1179,7 +1179,7 @@ extern unsigned int ext2fs_div_ceil(unsi
+ #define _INLINE_ extern
+ #else
+ #ifdef __GNUC__
+-#define _INLINE_ extern __inline__
++#define _INLINE_ extern __attribute__((__gnu_inline__)) __inline__
+ #else				/* For Watcom C */
+ #define _INLINE_ extern inline
+ #endif
diff --git a/filesystems/fuse-ext2/patches/patch-e2fsprogs-1.41.9_ext2fs_icount.c b/filesystems/fuse-ext2/patches/patch-e2fsprogs-1.41.9_ext2fs_icount.c
new file mode 100644
index 00000000000..912d440b27d
--- /dev/null
+++ b/filesystems/fuse-ext2/patches/patch-e2fsprogs-1.41.9_ext2fs_icount.c
@@ -0,0 +1,12 @@
+$NetBSD: patch-e2fsprogs-1.41.9_ext2fs_icount.c,v 1.1 2012/12/20 21:54:24 joerg Exp $
+
+--- e2fsprogs-1.41.9/ext2fs/icount.c.orig	2012-12-20 13:30:46.000000000 +0000
++++ e2fsprogs-1.41.9/ext2fs/icount.c
+@@ -8,6 +8,7 @@
+  * License.
+  * %End-Header%
+  */
++#include "config.h"
+ 
+ #if HAVE_UNISTD_H
+ #include <unistd.h>
diff --git a/filesystems/fuse-ext2/patches/patch-e2fsprogs-1.41.9_ext2fs_test__io.c b/filesystems/fuse-ext2/patches/patch-e2fsprogs-1.41.9_ext2fs_test__io.c
new file mode 100644
index 00000000000..6624c1902f7
--- /dev/null
+++ b/filesystems/fuse-ext2/patches/patch-e2fsprogs-1.41.9_ext2fs_test__io.c
@@ -0,0 +1,12 @@
+$NetBSD: patch-e2fsprogs-1.41.9_ext2fs_test__io.c,v 1.1 2012/12/20 21:54:24 joerg Exp $
+
+--- e2fsprogs-1.41.9/ext2fs/test_io.c.orig	2012-12-20 13:30:54.000000000 +0000
++++ e2fsprogs-1.41.9/ext2fs/test_io.c
+@@ -8,6 +8,7 @@
+  * License.
+  * %End-Header%
+  */
++#include "config.h"
+ 
+ #include <stdio.h>
+ #include <string.h>