File autofs-5-1-0-fix-gcc5-complaints.patch of Package autofs.6209

From: Ian Kent <raven@themaw.net>
Subject: autofs-5.1.0 - fix gcc5 complaints
Git-repo: git://git.kernel.org/pub/scm/linux/storage/autofs/autofs.git
Git-commit: a07ed95910473ca604a476a6dd2d11995577a815
Patch-mainline: 5.1.1

gcc5 is not happy with the way dump_core() and master_get_logopt()
are declared inline, remove the inline and let the compiler decide.

Acked-by: Jeff Mahoney <jeffm@suse.com>
---
 daemon/spawn.c      |    2 +-
 include/automount.h |    2 +-
 include/master.h    |    2 +-
 lib/master.c        |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

--- a/daemon/spawn.c
+++ b/daemon/spawn.c
@@ -36,7 +36,7 @@ static pthread_mutex_t spawn_mutex = PTH
 
 #define MTAB_LOCK_RETRIES	3
 
-inline void dump_core(void)
+void dump_core(void)
 {
 	sigset_t segv;
 
--- a/include/automount.h
+++ b/include/automount.h
@@ -223,7 +223,7 @@ const char **copy_argv(int argc, const c
 int compare_argv(int argc1, const char **argv1, int argc2, const char **argv2);
 int free_argv(int argc, const char **argv);
 
-inline void dump_core(void);
+void dump_core(void);
 int aquire_lock(void);
 void release_lock(void);
 int spawnl(unsigned logopt, const char *prog, ...);
--- a/include/master.h
+++ b/include/master.h
@@ -114,7 +114,7 @@ void master_notify_state_change(struct m
 int master_mount_mounts(struct master *, time_t, int);
 int dump_map(struct master *, const char *, const char *);
 int master_show_mounts(struct master *);
-extern inline unsigned int master_get_logopt(void);
+unsigned int master_get_logopt(void);
 int master_list_empty(struct master *);
 int master_done(struct master *);
 int master_kill(struct master *);
--- a/lib/master.c
+++ b/lib/master.c
@@ -1655,7 +1655,7 @@ int master_done(struct master *master)
 	return res;
 }
 
-inline unsigned int master_get_logopt(void)
+unsigned int master_get_logopt(void)
 {
 	return master_list ? master_list->logopt : LOGOPT_NONE;
 }
openSUSE Build Service is sponsored by