Fix inline usage.

6 files changed, 193 insertions, 1 deletions

diff --git a/filesystems/glusterfs/distinfo b/filesystems/glusterfs/distinfo
index daeb9c3077d..9536769f9f5 100644
--- a/filesystems/glusterfs/distinfo
+++ b/filesystems/glusterfs/distinfo
@@ -1,7 +1,12 @@
-$NetBSD: distinfo,v 1.26 2012/10/19 04:15:21 manu Exp $
+$NetBSD: distinfo,v 1.27 2012/12/20 21:53:20 joerg Exp $
 
 SHA1 (glusterfs-3.3.1.tar.gz) = c29632e4938533069c4c0206fb1c32de8443168d
 RMD160 (glusterfs-3.3.1.tar.gz) = 667bac9362aab01ab04f9119e399b8d955e01135
 Size (glusterfs-3.3.1.tar.gz) = 2636698 bytes
+SHA1 (patch-argp-standalone_argp-fmtstream.c) = 1a302c39cb8f09a56fc4b8d12589bbb69f92a0f3
+SHA1 (patch-argp-standalone_argp-fmtstream.h) = 896bee64bcf8966dede5e92ca9097db4c69e6aa4
 SHA1 (patch-da) = 312a8c73c1a22058dc43cf5f957380c42a5a23e4
 SHA1 (patch-db) = a97ac1bea9be2a9d7162eb495cb9b3c741d70e34
+SHA1 (patch-libglusterfs_src_rbthash.c) = 2e50cf8712e30cef5a4b30510fac65a6474b58b6
+SHA1 (patch-rpc_rpc-lib_src_rpc-clnt.c) = ad93375f38fce36437abae3ee499caa6b55e89e6
+SHA1 (patch-rpc_rpc-lib_src_rpcsvc.c) = 28b509411e421a1cd0e979a282786c28c59141e7
diff --git a/filesystems/glusterfs/patches/patch-argp-standalone_argp-fmtstream.c b/filesystems/glusterfs/patches/patch-argp-standalone_argp-fmtstream.c
new file mode 100644
index 00000000000..f8ced213fcf
--- /dev/null
+++ b/filesystems/glusterfs/patches/patch-argp-standalone_argp-fmtstream.c
@@ -0,0 +1,19 @@
+$NetBSD: patch-argp-standalone_argp-fmtstream.c,v 1.1 2012/12/20 21:53:20 joerg Exp $
+
+--- argp-standalone/argp-fmtstream.c.orig	2012-10-11 17:38:19.000000000 +0000
++++ argp-standalone/argp-fmtstream.c
+@@ -389,6 +389,7 @@ __argp_fmtstream_printf (struct argp_fmt
+ weak_alias (__argp_fmtstream_printf, argp_fmtstream_printf)
+ #endif
+ 
++#if __STDC_VERSION__ - 199900L < 1
+ /* Duplicate the inline definitions in argp-fmtstream.h, for compilers
+  * that don't do inlining. */
+ size_t
+@@ -471,5 +472,6 @@ __argp_fmtstream_point (argp_fmtstream_t
+     __argp_fmtstream_update (__fs);
+   return __fs->point_col >= 0 ? __fs->point_col : 0;
+ }
++#endif
+ 
+ #endif /* !ARGP_FMTSTREAM_USE_LINEWRAP */
diff --git a/filesystems/glusterfs/patches/patch-argp-standalone_argp-fmtstream.h b/filesystems/glusterfs/patches/patch-argp-standalone_argp-fmtstream.h
new file mode 100644
index 00000000000..728e913791e
--- /dev/null
+++ b/filesystems/glusterfs/patches/patch-argp-standalone_argp-fmtstream.h
@@ -0,0 +1,48 @@
+$NetBSD: patch-argp-standalone_argp-fmtstream.h,v 1.1 2012/12/20 21:53:20 joerg Exp $
+
+--- argp-standalone/argp-fmtstream.h.orig	2012-10-11 17:38:19.000000000 +0000
++++ argp-standalone/argp-fmtstream.h
+@@ -153,6 +153,7 @@ extern ssize_t argp_fmtstream_printf (ar
+ 				      __const char *__fmt, ...)
+      PRINTF_STYLE(2,3);
+ 
++#if 0
+ extern int __argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch);
+ extern int argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch);
+ 
+@@ -163,6 +164,7 @@ extern size_t __argp_fmtstream_write (ar
+ 				      __const char *__str, size_t __len);
+ extern size_t argp_fmtstream_write (argp_fmtstream_t __fs,
+ 				    __const char *__str, size_t __len);
++#endif
+ 
+ /* Access macros for various bits of state.  */
+ #define argp_fmtstream_lmargin(__fs) ((__fs)->lmargin)
+@@ -172,6 +174,7 @@ extern size_t argp_fmtstream_write (argp
+ #define __argp_fmtstream_rmargin argp_fmtstream_rmargin
+ #define __argp_fmtstream_wmargin argp_fmtstream_wmargin
+ 
++#if 0
+ /* Set __FS's left margin to LMARGIN and return the old value.  */
+ extern size_t argp_fmtstream_set_lmargin (argp_fmtstream_t __fs,
+ 					  size_t __lmargin);
+@@ -193,6 +196,7 @@ extern size_t __argp_fmtstream_set_wmarg
+ /* Return the column number of the current output point in __FS.  */
+ extern size_t argp_fmtstream_point (argp_fmtstream_t __fs);
+ extern size_t __argp_fmtstream_point (argp_fmtstream_t __fs);
++#endif
+ 
+ /* Internal routines.  */
+ extern void _argp_fmtstream_update (argp_fmtstream_t __fs);
+@@ -216,7 +220,11 @@ extern int __argp_fmtstream_ensure (argp
+ #endif
+ 
+ #ifndef ARGP_FS_EI
++#if defined(__GNUC__) && !defined(__GNUC_STDC_INLINE__)
+ #define ARGP_FS_EI extern inline
++#else
++#define ARGP_FS_EI inline
++#endif
+ #endif
+ 
+ ARGP_FS_EI size_t
diff --git a/filesystems/glusterfs/patches/patch-libglusterfs_src_rbthash.c b/filesystems/glusterfs/patches/patch-libglusterfs_src_rbthash.c
new file mode 100644
index 00000000000..1af05b78eed
--- /dev/null
+++ b/filesystems/glusterfs/patches/patch-libglusterfs_src_rbthash.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-libglusterfs_src_rbthash.c,v 1.1 2012/12/20 21:53:20 joerg Exp $
+
+--- libglusterfs/src/rbthash.c.orig	2012-12-20 15:00:05.000000000 +0000
++++ libglusterfs/src/rbthash.c
+@@ -228,7 +228,7 @@ rbthash_deinit_entry (rbthash_table_t *t
+ }
+ 
+ 
+-inline struct rbthash_bucket *
++struct rbthash_bucket *
+ rbthash_entry_bucket (rbthash_table_t *tbl, rbthash_entry_t * entry)
+ {
+         int     nbucket = 0;
+@@ -302,7 +302,7 @@ err:
+         return ret;
+ }
+ 
+-inline struct rbthash_bucket *
++struct rbthash_bucket *
+ rbthash_key_bucket (rbthash_table_t *tbl, void *key, int keylen)
+ {
+         uint32_t        keyhash = 0;
diff --git a/filesystems/glusterfs/patches/patch-rpc_rpc-lib_src_rpc-clnt.c b/filesystems/glusterfs/patches/patch-rpc_rpc-lib_src_rpc-clnt.c
new file mode 100644
index 00000000000..174618c4745
--- /dev/null
+++ b/filesystems/glusterfs/patches/patch-rpc_rpc-lib_src_rpc-clnt.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-rpc_rpc-lib_src_rpc-clnt.c,v 1.1 2012/12/20 21:53:20 joerg Exp $
+
+--- rpc/rpc-lib/src/rpc-clnt.c.orig	2012-12-20 14:57:05.000000000 +0000
++++ rpc/rpc-lib/src/rpc-clnt.c
+@@ -951,7 +951,7 @@ rpc_clnt_connection_deinit (rpc_clnt_con
+ }
+ 
+ 
+-inline int
++int
+ rpc_clnt_connection_init (struct rpc_clnt *clnt, glusterfs_ctx_t *ctx,
+                           dict_t *options, char *name)
+ {
diff --git a/filesystems/glusterfs/patches/patch-rpc_rpc-lib_src_rpcsvc.c b/filesystems/glusterfs/patches/patch-rpc_rpc-lib_src_rpcsvc.c
new file mode 100644
index 00000000000..a8fcb859631
--- /dev/null
+++ b/filesystems/glusterfs/patches/patch-rpc_rpc-lib_src_rpcsvc.c
@@ -0,0 +1,85 @@
+$NetBSD: patch-rpc_rpc-lib_src_rpcsvc.c,v 1.1 2012/12/20 21:53:20 joerg Exp $
+
+--- rpc/rpc-lib/src/rpcsvc.c.orig	2012-12-20 14:55:50.000000000 +0000
++++ rpc/rpc-lib/src/rpcsvc.c
+@@ -220,7 +220,7 @@ err:
+ /* this procedure can only pass 4 arguments to registered notifyfn. To send more
+  * arguments call wrapper->notify directly.
+  */
+-inline void
++void
+ rpcsvc_program_notify (rpcsvc_listener_t *listener, rpcsvc_event_t event,
+                        void *data)
+ {
+@@ -243,7 +243,7 @@ out:
+ }
+ 
+ 
+-inline int
++int
+ rpcsvc_accept (rpcsvc_t *svc, rpc_transport_t *listen_trans,
+                rpc_transport_t *new_trans)
+ {
+@@ -687,7 +687,7 @@ err:
+         return txrecord;
+ }
+ 
+-inline int
++int
+ rpcsvc_get_callid (rpcsvc_t *rpc)
+ {
+         return GF_UNIVERSAL_ANSWER;
+@@ -873,7 +873,7 @@ out:
+         return ret;
+ }
+ 
+-inline int
++int
+ rpcsvc_transport_submit (rpc_transport_t *trans, struct iovec *hdrvec,
+                          int hdrcount, struct iovec *proghdr, int proghdrcount,
+                          struct iovec *progpayload, int progpayloadcount,
+@@ -1120,7 +1120,7 @@ rpcsvc_error_reply (rpcsvc_request_t *re
+ 
+ 
+ /* Register the program with the local portmapper service. */
+-inline int
++int
+ rpcsvc_program_register_portmap (rpcsvc_program_t *newprog, uint32_t port)
+ {
+         int                ret   = 0;
+@@ -1142,7 +1142,7 @@ out:
+ }
+ 
+ 
+-inline int
++int
+ rpcsvc_program_unregister_portmap (rpcsvc_program_t *prog)
+ {
+         int ret = 0;
+@@ -1320,7 +1320,7 @@ out:
+ }
+ 
+ 
+-inline int
++int
+ rpcsvc_transport_peername (rpc_transport_t *trans, char *hostname, int hostlen)
+ {
+         if (!trans) {
+@@ -1331,7 +1331,7 @@ rpcsvc_transport_peername (rpc_transport
+ }
+ 
+ 
+-inline int
++int
+ rpcsvc_transport_peeraddr (rpc_transport_t *trans, char *addrstr, int addrlen,
+                            struct sockaddr_storage *sa, socklen_t sasize)
+ {
+@@ -1583,7 +1583,7 @@ out:
+ }
+ 
+ 
+-inline int
++int
+ rpcsvc_program_register (rpcsvc_t *svc, rpcsvc_program_t *program)
+ {
+         int               ret                = -1;