From owner-svn-src-head@freebsd.org  Tue Nov 17 17:11:08 2020
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5A81346978F;
 Tue, 17 Nov 2020 17:11:08 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4CbCC01nDLz4tXG;
 Tue, 17 Nov 2020 17:11:08 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 30860232D4;
 Tue, 17 Nov 2020 17:11:08 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0AHHB7qG014871;
 Tue, 17 Nov 2020 17:11:07 GMT (envelope-from adrian@FreeBSD.org)
Received: (from adrian@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0AHHB7XO014869;
 Tue, 17 Nov 2020 17:11:07 GMT (envelope-from adrian@FreeBSD.org)
Message-Id: <202011171711.0AHHB7XO014869@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: adrian set sender to
 adrian@FreeBSD.org using -f
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Tue, 17 Nov 2020 17:11:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r367770 - head/sys/cddl/contrib/opensolaris/common/lz4
X-SVN-Group: head
X-SVN-Commit-Author: adrian
X-SVN-Commit-Paths: head/sys/cddl/contrib/opensolaris/common/lz4
X-SVN-Commit-Revision: 367770
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Nov 2020 17:11:08 -0000

Author: adrian
Date: Tue Nov 17 17:11:07 2020
New Revision: 367770
URL: https://svnweb.freebsd.org/changeset/base/367770

Log:
  [cddl] Fix lz4 function definitions to not tri pup compile.
  
  This tripped up in llvm compilation on amd64 noting that lz4_init/lz4_fini
  were lacking in being previously defined.
  
  Reviewed by:	emaste, freqlabs, brooks
  Differential Revision:	https://reviews.freebsd.org/D27240

Modified:
  head/sys/cddl/contrib/opensolaris/common/lz4/lz4.c
  head/sys/cddl/contrib/opensolaris/common/lz4/lz4.h

Modified: head/sys/cddl/contrib/opensolaris/common/lz4/lz4.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/common/lz4/lz4.c	Tue Nov 17 16:54:12 2020	(r367769)
+++ head/sys/cddl/contrib/opensolaris/common/lz4/lz4.c	Tue Nov 17 17:11:07 2020	(r367770)
@@ -1024,7 +1024,7 @@ LZ4_uncompress_unknownOutputSize(const char *source, c
 }
 
 #if defined(_KERNEL) || defined(_FAKE_KERNEL)
-extern void
+void
 lz4_init(void)
 {
 
@@ -1034,7 +1034,7 @@ lz4_init(void)
 #endif
 }
 
-extern void
+void
 lz4_fini(void)
 {
 

Modified: head/sys/cddl/contrib/opensolaris/common/lz4/lz4.h
==============================================================================
--- head/sys/cddl/contrib/opensolaris/common/lz4/lz4.h	Tue Nov 17 16:54:12 2020	(r367769)
+++ head/sys/cddl/contrib/opensolaris/common/lz4/lz4.h	Tue Nov 17 17:11:07 2020	(r367770)
@@ -43,6 +43,11 @@ extern "C" {
 extern size_t lz4_compress(void *, void *, size_t, size_t, int);
 extern int lz4_decompress(void *, void *, size_t, size_t, int);
 
+#if defined(_KERNEL) || defined(_FAKE_KERNEL)
+extern void lz4_init(void);
+extern void lz4_fini(void);
+#endif
+
 #ifdef __cplusplus
 }
 #endif