Tue Jul 3 18:13:47 2012 UTC ()
Fix build with c99 compilers
(joerg)
diff -r1.2 -r1.3 pkgsrc/devel/argp/distinfo
diff -r0 -r1.1 pkgsrc/devel/argp/patches/patch-argp-fmtstream.c
diff -r0 -r1.1 pkgsrc/devel/argp/patches/patch-argp-fmtstream.h
--- pkgsrc/devel/argp/distinfo 2007/12/22 01:40:21 1.2
+++ pkgsrc/devel/argp/distinfo 2012/07/03 18:13:47 1.3
| @@ -1,7 +1,9 @@ | | | @@ -1,7 +1,9 @@ |
| 1 | $NetBSD: distinfo,v 1.2 2007/12/22 01:40:21 joerg Exp $ | | 1 | $NetBSD: distinfo,v 1.3 2012/07/03 18:13:47 joerg Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (argp-standalone-1.3.tar.gz) = 815c560680ebdc11694b88de2f8ec15133e0bfa0 | | 3 | SHA1 (argp-standalone-1.3.tar.gz) = 815c560680ebdc11694b88de2f8ec15133e0bfa0 |
| 4 | RMD160 (argp-standalone-1.3.tar.gz) = 1c5cd0b1c382d93774be636a1ea2758d530cfef4 | | 4 | RMD160 (argp-standalone-1.3.tar.gz) = 1c5cd0b1c382d93774be636a1ea2758d530cfef4 |
| 5 | Size (argp-standalone-1.3.tar.gz) = 130255 bytes | | 5 | Size (argp-standalone-1.3.tar.gz) = 130255 bytes |
| 6 | SHA1 (patch-aa) = 056655a5322beda281f370a02e08a71810b8439d | | 6 | SHA1 (patch-aa) = 056655a5322beda281f370a02e08a71810b8439d |
| 7 | SHA1 (patch-ab) = 7ed54ce579b922416aceb0c4e3959307557e8af6 | | 7 | SHA1 (patch-ab) = 7ed54ce579b922416aceb0c4e3959307557e8af6 |
| | | 8 | SHA1 (patch-argp-fmtstream.c) = c7e763bb317702e5072570783629d8e973e5f077 |
| | | 9 | SHA1 (patch-argp-fmtstream.h) = 7fd13de60b376001ee5eee72a065385b4abf9923 |
$NetBSD: patch-argp-fmtstream.c,v 1.1 2012/07/03 18:13:47 joerg Exp $
--- argp-fmtstream.c.orig 2003-12-11 08:37:05.000000000 +0000
+++ 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 */
$NetBSD: patch-argp-fmtstream.h,v 1.1 2012/07/03 18:13:47 joerg Exp $
--- argp-fmtstream.h.orig 2003-12-11 08:37:05.000000000 +0000
+++ argp-fmtstream.h
@@ -145,6 +145,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);
@@ -155,6 +156,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)
@@ -164,6 +166,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);
@@ -185,6 +188,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);
@@ -208,7 +212,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