Fix inline use.

3 files changed, 70 insertions, 1 deletions

diff --git a/security/lsh/distinfo b/security/lsh/distinfo
index da0e566934c..341c07bb017 100644
--- a/security/lsh/distinfo
+++ b/security/lsh/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2011/12/16 12:54:41 drochner Exp $
+$NetBSD: distinfo,v 1.10 2013/03/03 01:09:34 joerg Exp $
 
 SHA1 (lsh-2.0.4.tar.gz) = c4e2a0b6a0e20dcba7fe02a0d5605bc00960106a
 RMD160 (lsh-2.0.4.tar.gz) = 24f16d6945f7c801aac190fd0109cad608a317de
@@ -7,3 +7,5 @@ SHA1 (patch-aa) = ae43022c180e9f8ee2bb95fe424f371e834fdf07
 SHA1 (patch-ab) = e241831267630ffcf0b7079627e91c58482427c3
 SHA1 (patch-ac) = a47ceb727fba55ab914d08cb440627a38965edcd
 SHA1 (patch-ad) = 6b20cfebe3b83aad399bd0a1c772d94328be7247
+SHA1 (patch-src_argp_argp-fmtstream.c) = 2a57132fcd1300c5cb2f7285ebb375d347988192
+SHA1 (patch-src_argp_argp-fmtstream.h) = 4b7a6bdde195aff4ae8c49a651d0f4b7fda9f227
diff --git a/security/lsh/patches/patch-src_argp_argp-fmtstream.c b/security/lsh/patches/patch-src_argp_argp-fmtstream.c
new file mode 100644
index 00000000000..ed145c8cf43
--- /dev/null
+++ b/security/lsh/patches/patch-src_argp_argp-fmtstream.c
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_argp_argp-fmtstream.c,v 1.1 2013/03/03 01:09:34 joerg Exp $
+
+--- src/argp/argp-fmtstream.c.orig	2003-03-13 17:59:09.000000000 +0000
++++ src/argp/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/security/lsh/patches/patch-src_argp_argp-fmtstream.h b/security/lsh/patches/patch-src_argp_argp-fmtstream.h
new file mode 100644
index 00000000000..d0be94a8649
--- /dev/null
+++ b/security/lsh/patches/patch-src_argp_argp-fmtstream.h
@@ -0,0 +1,48 @@
+$NetBSD: patch-src_argp_argp-fmtstream.h,v 1.1 2013/03/03 01:09:34 joerg Exp $
+
+--- src/argp/argp-fmtstream.h.orig	2004-03-01 22:18:45.000000000 +0000
++++ src/argp/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