svn commit: r277538 - stable/10/usr.bin/sed

[Pedro F. Giffuni]

Author: pfg
Date: Thu Jan 22 21:41:41 2015
New Revision: 277538
URL: https://svnweb.freebsd.org/changeset/base/277538

Log:
  MFC	r276832 (partial), r277099
  
  Avoid a warning from gcc48.
  Replace __inline GNUism with the standard inline.

Modified:
  stable/10/usr.bin/sed/process.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.bin/sed/process.c
==============================================================================
--- stable/10/usr.bin/sed/process.c	Thu Jan 22 21:17:58 2015	(r277537)
+++ stable/10/usr.bin/sed/process.c	Thu Jan 22 21:41:41 2015	(r277538)
@@ -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)
 {