From f4cf7677766dbb7d2ec3b153caa1fa71f1a267f0 Mon Sep 17 00:00:00 2001 From: pfg Date: Thu, 22 Jan 2015 21:41:41 +0000 Subject: [PATCH] MFC r276832 (partial), r277099 Avoid a warning from gcc48. Replace __inline GNUism with the standard inline. git-svn-id: svn://svn.freebsd.org/base/stable/10@277538 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- usr.bin/sed/process.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.bin/sed/process.c b/usr.bin/sed/process.c index a500200dd..cf704f035 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) { -- 2.45.0