1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
|
Subject: Fix FTBFS from gcc-5 on
Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
Date: 2018-10-27
Bug-Debian: https://bugs.debian.org/778101 https://bugs.debian.org/868970
Forwarded: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=778101#14
--- a/lib/argp-fmtstream.h
+++ b/lib/argp-fmtstream.h
@@ -135,16 +135,16 @@
const char *__fmt, ...)
__attribute__ ((__format__ (printf, 2, 3)));
-extern int __argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch);
-extern int argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch);
+/* extern int __argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch); */
+/* extern int argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch); */
-extern int __argp_fmtstream_puts (argp_fmtstream_t __fs, const char *__str);
-extern int argp_fmtstream_puts (argp_fmtstream_t __fs, const char *__str);
+/* extern int __argp_fmtstream_puts (argp_fmtstream_t __fs, const char *__str); */
+/* extern int argp_fmtstream_puts (argp_fmtstream_t __fs, const char *__str); */
-extern size_t __argp_fmtstream_write (argp_fmtstream_t __fs,
- const char *__str, size_t __len);
-extern size_t argp_fmtstream_write (argp_fmtstream_t __fs,
- const char *__str, size_t __len);
+/* extern size_t __argp_fmtstream_write (argp_fmtstream_t __fs,
+ const char *__str, size_t __len); */
+/* extern size_t argp_fmtstream_write (argp_fmtstream_t __fs,
+ const char *__str, size_t __len); */
/* Access macros for various bits of state. */
#define argp_fmtstream_lmargin(__fs) ((__fs)->lmargin)
@@ -155,26 +155,26 @@
#define __argp_fmtstream_wmargin argp_fmtstream_wmargin
/* 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);
-extern size_t __argp_fmtstream_set_lmargin (argp_fmtstream_t __fs,
- size_t __lmargin);
+/* extern size_t argp_fmtstream_set_lmargin (argp_fmtstream_t __fs,
+ size_t __lmargin); */
+/* extern size_t __argp_fmtstream_set_lmargin (argp_fmtstream_t __fs,
+ size_t __lmargin); */
/* Set __FS's right margin to __RMARGIN and return the old value. */
-extern size_t argp_fmtstream_set_rmargin (argp_fmtstream_t __fs,
- size_t __rmargin);
-extern size_t __argp_fmtstream_set_rmargin (argp_fmtstream_t __fs,
- size_t __rmargin);
+/* extern size_t argp_fmtstream_set_rmargin (argp_fmtstream_t __fs,
+ size_t __rmargin); */
+/* extern size_t __argp_fmtstream_set_rmargin (argp_fmtstream_t __fs,
+ size_t __rmargin); */
/* Set __FS's wrap margin to __WMARGIN and return the old value. */
-extern size_t argp_fmtstream_set_wmargin (argp_fmtstream_t __fs,
- size_t __wmargin);
-extern size_t __argp_fmtstream_set_wmargin (argp_fmtstream_t __fs,
- size_t __wmargin);
+/* extern size_t argp_fmtstream_set_wmargin (argp_fmtstream_t __fs,
+ size_t __wmargin); */
+/* extern size_t __argp_fmtstream_set_wmargin (argp_fmtstream_t __fs,
+ size_t __wmargin); */
/* 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);
+/* extern size_t argp_fmtstream_point (argp_fmtstream_t __fs); */
+/* extern size_t __argp_fmtstream_point (argp_fmtstream_t __fs); */
/* Internal routines. */
extern void _argp_fmtstream_update (argp_fmtstream_t __fs);
@@ -198,7 +198,7 @@
#endif
#ifndef ARGP_FS_EI
-#define ARGP_FS_EI extern inline
+#define ARGP_FS_EI static inline
#endif
ARGP_FS_EI size_t
--- a/lib/argp.h
+++ b/lib/argp.h
@@ -520,8 +520,8 @@
unsigned int __flags);
/* Possibly output the standard usage message for ARGP to stderr and exit. */
-extern void argp_usage (const struct argp_state *__state);
-extern void __argp_usage (const struct argp_state *__state);
+/* extern void argp_usage (const struct argp_state *__state); */
+/* extern void __argp_usage (const struct argp_state *__state); */
/* If appropriate, print the printf string FMT and following args, preceded
by the program name and `:', to stderr, and followed by a `Try ... --help'
@@ -551,13 +551,13 @@
__attribute__ ((__format__ (__printf__, 4, 5)));
/* Returns true if the option OPT is a valid short option. */
-extern int _option_is_short (const struct argp_option *__opt) __THROW;
-extern int __option_is_short (const struct argp_option *__opt) __THROW;
+/* extern int _option_is_short (const struct argp_option *__opt) __THROW; */
+/* extern int __option_is_short (const struct argp_option *__opt) __THROW; */
/* Returns true if the option OPT is in fact the last (unused) entry in an
options array. */
-extern int _option_is_end (const struct argp_option *__opt) __THROW;
-extern int __option_is_end (const struct argp_option *__opt) __THROW;
+/* extern int _option_is_end (const struct argp_option *__opt) __THROW; */
+/* extern int __option_is_end (const struct argp_option *__opt) __THROW; */
/* Return the input field for ARGP in the parser corresponding to STATE; used
by the help routines. */
@@ -578,7 +578,7 @@
# endif
# ifndef ARGP_EI
-# define ARGP_EI extern __inline__
+# define ARGP_EI static __inline__
# endif
ARGP_EI void
|
