From owner-svn-src-head@freebsd.org  Thu Sep  5 18:07:41 2019
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 75C37EF3BF;
 Thu,  5 Sep 2019 18:07:41 +0000 (UTC)
 (envelope-from tsoome@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)
 server-signature RSA-PSS (4096 bits)
 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 46PTDs2SVpz4Bf5;
 Thu,  5 Sep 2019 18:07:41 +0000 (UTC)
 (envelope-from tsoome@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 331768142;
 Thu,  5 Sep 2019 18:07:41 +0000 (UTC)
 (envelope-from tsoome@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x85I7feR042945;
 Thu, 5 Sep 2019 18:07:41 GMT (envelope-from tsoome@FreeBSD.org)
Received: (from tsoome@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x85I7fRd042944;
 Thu, 5 Sep 2019 18:07:41 GMT (envelope-from tsoome@FreeBSD.org)
Message-Id: <201909051807.x85I7fRd042944@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tsoome set sender to
 tsoome@FreeBSD.org using -f
From: Toomas Soome <tsoome@FreeBSD.org>
Date: Thu, 5 Sep 2019 18:07:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r351881 - head/sys/teken
X-SVN-Group: head
X-SVN-Commit-Author: tsoome
X-SVN-Commit-Paths: head/sys/teken
X-SVN-Commit-Revision: 351881
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.29
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: Thu, 05 Sep 2019 18:07:41 -0000

Author: tsoome
Date: Thu Sep  5 18:07:40 2019
New Revision: 351881
URL: https://svnweb.freebsd.org/changeset/base/351881

Log:
  Adjust teken to allow build as part of loader
  
  Building for loader needs specific headers.

Modified:
  head/sys/teken/teken.c

Modified: head/sys/teken/teken.c
==============================================================================
--- head/sys/teken/teken.c	Thu Sep  5 17:54:57 2019	(r351880)
+++ head/sys/teken/teken.c	Thu Sep  5 18:07:40 2019	(r351881)
@@ -35,7 +35,12 @@
 #include <sys/lock.h>
 #include <sys/systm.h>
 #define	teken_assert(x)		MPASS(x)
-#else /* !(__FreeBSD__ && _KERNEL) */
+#elif defined(__FreeBSD__) && defined(_STANDALONE)
+#include <stand.h>
+#include <sys/limits.h>
+#include <assert.h>
+#define	teken_assert(x)		assert(x)
+#else /* !(__FreeBSD__ && _STANDALONE) */
 #include <sys/types.h>
 #include <assert.h>
 #include <limits.h>
@@ -43,7 +48,7 @@
 #include <stdio.h>
 #include <string.h>
 #define	teken_assert(x)		assert(x)
-#endif /* __FreeBSD__ && _KERNEL */
+#endif /* __FreeBSD__ && _STANDALONE */
 
 /* debug messages */
 #define	teken_printf(x,...)