From owner-svn-src-head@freebsd.org  Tue Aug 25 23:35:55 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 C7BD23C0C8F;
 Tue, 25 Aug 2020 23:35:55 +0000 (UTC)
 (envelope-from mmacy@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 4Bbljl4xV4z4LRZ;
 Tue, 25 Aug 2020 23:35:55 +0000 (UTC)
 (envelope-from mmacy@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 8B99A9A66;
 Tue, 25 Aug 2020 23:35:55 +0000 (UTC)
 (envelope-from mmacy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07PNZtuG035515;
 Tue, 25 Aug 2020 23:35:55 GMT (envelope-from mmacy@FreeBSD.org)
Received: (from mmacy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07PNZtNK035514;
 Tue, 25 Aug 2020 23:35:55 GMT (envelope-from mmacy@FreeBSD.org)
Message-Id: <202008252335.07PNZtNK035514@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mmacy set sender to
 mmacy@FreeBSD.org using -f
From: Matt Macy <mmacy@FreeBSD.org>
Date: Tue, 25 Aug 2020 23:35:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r364788 - head/sys/cddl/contrib/opensolaris/common/lz4
X-SVN-Group: head
X-SVN-Commit-Author: mmacy
X-SVN-Commit-Paths: head/sys/cddl/contrib/opensolaris/common/lz4
X-SVN-Commit-Revision: 364788
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.33
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, 25 Aug 2020 23:35:55 -0000

Author: mmacy
Date: Tue Aug 25 23:35:55 2020
New Revision: 364788
URL: https://svnweb.freebsd.org/changeset/base/364788

Log:
  ZFS:  band-aid for -DNO_CLEAN
  
  Submitted by:	Neal Chauhan
  Approved by:	imp@
  Differential Revision:	https://reviews.freebsd.org/D26183

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

Modified: head/sys/cddl/contrib/opensolaris/common/lz4/lz4.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/common/lz4/lz4.c	Tue Aug 25 23:26:52 2020	(r364787)
+++ head/sys/cddl/contrib/opensolaris/common/lz4/lz4.c	Tue Aug 25 23:35:55 2020	(r364788)
@@ -44,6 +44,7 @@
 #include <sys/endian.h>
 #include <assert.h>
 
+#undef ASSERT
 #define	ASSERT	assert
 #else
 #include <string.h>
@@ -52,9 +53,10 @@
 #include <netinet/in.h>
 #include <assert.h>
 
+#undef ASSERT
 #define	ASSERT	assert
 #endif
-#include <lz4.h>
+#include "lz4.h"
 
 static int real_LZ4_compress(const char *source, char *dest, int isize,
     int osize);