summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpfg <pfg@FreeBSD.org>2015-01-22 21:41:41 +0000
committerpfg <pfg@FreeBSD.org>2015-01-22 21:41:41 +0000
commitde76b0c7d4f55f5898e01c1cba89ca231c308878 (patch)
tree2cbd6c462c7ff770a5ed0b7029738ea178d4361e
parentf4cd08de015fb504a60c3d1153891bd9390ed9d5 (diff)
downloadFreeBSD-src-de76b0c7d4f55f5898e01c1cba89ca231c308878.zip
FreeBSD-src-de76b0c7d4f55f5898e01c1cba89ca231c308878.tar.gz
MFC r276832 (partial), r277099
Avoid a warning from gcc48. Replace __inline GNUism with the standard inline.
-rw-r--r--usr.bin/sed/process.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/sed/process.c b/usr.bin/sed/process.c
index a500200..cf704f0 100644
--- a/usr.bin/sed/process.c
+++ b/usr.bin/sed/process.c
@@ -66,11 +66,11 @@ static SPACE HS, PS, SS, YS;
#define hs HS.space
#define hsl HS.len
-static __inline int applies(struct s_command *);
+static inline int applies(struct s_command *);
static void do_tr(struct s_tr *);
static void flush_appends(void);
static void lputs(char *, size_t);
-static __inline int regexec_e(regex_t *, const char *, int, int, size_t);
+static int regexec_e(regex_t *, const char *, int, int, size_t);
static void regsub(SPACE *, char *, char *);
static int substitute(struct s_command *);
@@ -278,7 +278,7 @@ new: if (!nflag && !pd)
* Return TRUE if the command applies to the current line. Sets the start
* line for process ranges. Interprets the non-select (``!'') flag.
*/
-static __inline int
+static inline int
applies(struct s_command *cp)
{
int r;
@@ -644,7 +644,7 @@ lputs(char *s, size_t len)
errx(1, "%s: %s", outfname, strerror(errno ? errno : EIO));
}
-static __inline int
+static int
regexec_e(regex_t *preg, const char *string, int eflags, int nomatch,
size_t slen)
{
OpenPOWER on IntegriCloud