Author: asomers
Date: Sun Feb 25 14:29:43 2018
New Revision: 329984
URL: https://svnweb.freebsd.org/changeset/base/329984
Log:
Don't declare __assfail as static
It gets called by dmu_buf_init_user, which is inline but not static. So it
needs global linkage itself.
Reported by: GCC-6
MFC after: 17 days
X-MFC-With: 329722
Modified:
head/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
head/sys/cddl/compat/opensolaris/sys/assfail.h
Modified: head/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c Sun Feb 25
13:20:32 2018 (r329983)
+++ head/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c Sun Feb 25
14:29:43 2018 (r329984)
@@ -32,6 +32,7 @@
#include <string.h>
#include <zlib.h>
#include <libgen.h>
+#include <sys/assfail.h>
#include <sys/spa.h>
#include <sys/stat.h>
#include <sys/processor.h>
Modified: head/sys/cddl/compat/opensolaris/sys/assfail.h
==============================================================================
--- head/sys/cddl/compat/opensolaris/sys/assfail.h Sun Feb 25 13:20:32
2018 (r329983)
+++ head/sys/cddl/compat/opensolaris/sys/assfail.h Sun Feb 25 14:29:43
2018 (r329984)
@@ -48,7 +48,9 @@ void assfail3(const char *, uintmax_t, const char *, u
#ifndef HAVE_ASSFAIL
extern int aok;
-static __inline int
+__inline int __assfail(const char *expr, const char *file, int line);
+
+__inline int
__assfail(const char *expr, const char *file, int line)
{
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
