From nobody Thu Jan 25 04:48:03 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
	by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TL7cf4MLqz57hw1
	for <dev-commits-src-main@mlmmj.nyi.freebsd.org>; Thu, 25 Jan 2024 04:48:18 +0000 (UTC)
	(envelope-from wlosh@bsdimp.com)
Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534])
	(using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
	 client-signature RSA-PSS (2048 bits) client-digest SHA256)
	(Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK))
	by mx1.freebsd.org (Postfix) with ESMTPS id 4TL7cf1kFyz4TF6
	for <dev-commits-src-main@freebsd.org>; Thu, 25 Jan 2024 04:48:18 +0000 (UTC)
	(envelope-from wlosh@bsdimp.com)
Authentication-Results: mx1.freebsd.org;
	none
Received: by mail-ed1-x534.google.com with SMTP id 4fb4d7f45d1cf-55d0031d8b5so123429a12.2
        for <dev-commits-src-main@freebsd.org>; Wed, 24 Jan 2024 20:48:18 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1706158095; x=1706762895; darn=freebsd.org;
        h=cc:to:subject:message-id:date:from:in-reply-to:references
         :mime-version:from:to:cc:subject:date:message-id:reply-to;
        bh=ynlZHQrk9q3PTTxCn2DnIFkSiQSQ95mmWMqHx7YZrjQ=;
        b=UbgVwnG3WqH4T3Ry23Ck2bAPeQxHoBKREvqKtI/shl6T+kF61AbFAod5LKuqxGNWhQ
         xTrb5HaMp0wDw//niRwPGi9TMKKT16/WT0l4MWbmHbkJdD5QwdVSfI4x0I2FbGYAiehE
         2G8L9/V3IW1E/OINpkEnGBE7bxNKgQlw2q1+nton7gqSIMpSL24snOgG74WFiEDFFI/X
         tO8CmGoJdjkDCN0KuptD0j8Vu8K4PO+RGzN4aNOciVajyAEzjp0vBi5+rKtJ3FAUF5Hh
         mkjWS3vppk2NpEhMcc1+xq6zMNuVQZ1QEAJT4dmzAbcDoj1pf63IrXfapk8WOfK+N2Ux
         vXNw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20230601; t=1706158095; x=1706762895;
        h=cc:to:subject:message-id:date:from:in-reply-to:references
         :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id
         :reply-to;
        bh=ynlZHQrk9q3PTTxCn2DnIFkSiQSQ95mmWMqHx7YZrjQ=;
        b=ivnfh+fYDdwRgQSl594t6R0L5f0ulOZkpD6Cq1nIxEDbVrEIcXA080cyEt4e44cbjy
         q6h2x+C31PsZx2Td0ZYNx8seRffuwdbr0p6ulCdQLIDJxB/88JGa1uMV99NqMFBrqmhA
         UckjmvdPigRHMRSQC8M3Hob4wJIj4fd++nnCibDf37xFFNHOwOsKxxSqlN7CkVeIAzha
         5gpfeLBVK4oFaNCymtXfhGKfG3KQSYODca05LOQzRDdZ+hbmdIFIXokiIEANcxbss2KG
         QdVuYuvUZF2M0N0azhItoQetzhoCGy0Q8XeTHbIo9lLRgGm3nBTQpoj9APIYiLzH9Fx5
         f6iA==
X-Gm-Message-State: AOJu0YwVXD2wfM0y4IIXVq5yjZKbjaxBylH+W05UthEWJFuzA9UvHwsd
	5McCqIuUQkfYjo4YuPcf3xErjMDD3d/VygDXxC2E9TEWS77j+uFT+/q5Hb0PVoPuwsLD7/DOTtN
	m4/IyVQKEIUsVEhilGGUiuS+2XQZQXiCgsgR/bQ==
X-Google-Smtp-Source: AGHT+IGCvM5K5fxfq+m69F2ZkkCMHAmdx2MmMsNJTUy8tMDUUBryQWpYEkWuw6FaxM8s7ycetJDy+WXTtvu1h4rscLY=
X-Received: by 2002:aa7:c554:0:b0:55c:210b:7503 with SMTP id
 s20-20020aa7c554000000b0055c210b7503mr236406edr.45.1706158095105; Wed, 24 Jan
 2024 20:48:15 -0800 (PST)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-main@freebsd.org
X-BeenThere: dev-commits-src-main@freebsd.org
MIME-Version: 1.0
References: <202401250351.40P3p2on023675@gitrepo.freebsd.org>
In-Reply-To: <202401250351.40P3p2on023675@gitrepo.freebsd.org>
From: Warner Losh <imp@bsdimp.com>
Date: Wed, 24 Jan 2024 21:48:03 -0700
Message-ID: <CANCZdfp8MNbMYaP7YtyW9yVZ=hWnEn7ncvwQ9zJa1FM0sCbREw@mail.gmail.com>
Subject: Re: git: fbd156d78fbd - main - Revert "nl_types.h: explicitly include cdefs.h"
To: Ed Maste <emaste@freebsd.org>
Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, 
	dev-commits-src-main@freebsd.org
Content-Type: multipart/alternative; boundary="00000000000030a393060fbde35b"
X-Rspamd-Queue-Id: 4TL7cf1kFyz4TF6
X-Spamd-Bar: ----
X-Rspamd-Pre-Result: action=no action;
	module=replies;
	Message is reply to one we originated
X-Spamd-Result: default: False [-4.00 / 15.00];
	REPLY(-4.00)[];
	ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]

--00000000000030a393060fbde35b
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

Thanks Ed...

I think that

diff --git a/tools/build/cross-build/include/linux/sys/types.h
b/tools/build/cross-build/include/linux/sys/types.h
index 770b3057f8a8..e72e1419bccd 100644
--- a/tools/build/cross-build/include/linux/sys/types.h
+++ b/tools/build/cross-build/include/linux/sys/types.h
@@ -35,6 +35,11 @@
  */
 #pragma once

+/*
+ * FreeBSD's types.h always includes sys/cdefs.h, but Linux headers often
don't.
+ */
+#include <sys/cdefs.h>
+
 #include_next <sys/types.h>

 #ifndef __size_t

will filx the problem, but I can't test things easily enough.

Warner

On Wed, Jan 24, 2024 at 8:51=E2=80=AFPM Ed Maste <emaste@freebsd.org> wrote=
:

> The branch main has been updated by emaste:
>
> URL:
> https://cgit.FreeBSD.org/src/commit/?id=3Dfbd156d78fbdc5e1984afe4d83436b6=
24e7a1f01
>
> commit fbd156d78fbdc5e1984afe4d83436b624e7a1f01
> Author:     Ed Maste <emaste@FreeBSD.org>
> AuthorDate: 2024-01-25 03:49:45 +0000
> Commit:     Ed Maste <emaste@FreeBSD.org>
> CommitDate: 2024-01-25 03:50:49 +0000
>
>     Revert "nl_types.h: explicitly include cdefs.h"
>
>     This isn't the right approach for addressing this cross-build issue.
>
>     This reverts commit 820401bf176996e41091d2e4190aded12a966b1d.
> ---
>  include/nl_types.h | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/include/nl_types.h b/include/nl_types.h
> index 6ba15132126d..120d1911631f 100644
> --- a/include/nl_types.h
> +++ b/include/nl_types.h
> @@ -34,7 +34,6 @@
>  #ifndef _NL_TYPES_H_
>  #define _NL_TYPES_H_
>
> -#include <sys/cdefs.h>
>  #include <sys/types.h>
>
>  #ifdef _NLS_PRIVATE
>

--00000000000030a393060fbde35b
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr"><div>Thanks Ed...</div><div><br></div><div>I think that</d=
iv><div><br></div><div>diff --git a/tools/build/cross-build/include/linux/s=
ys/types.h b/tools/build/cross-build/include/linux/sys/types.h<br>index 770=
b3057f8a8..e72e1419bccd 100644<br>--- a/tools/build/cross-build/include/lin=
ux/sys/types.h<br>+++ b/tools/build/cross-build/include/linux/sys/types.h<b=
r>@@ -35,6 +35,11 @@<br>=C2=A0 */<br>=C2=A0#pragma once<br>=C2=A0<br>+/*<br=
>+ * FreeBSD&#39;s types.h always includes sys/cdefs.h, but Linux headers o=
ften don&#39;t.<br>+ */<br>+#include &lt;sys/cdefs.h&gt;<br>+<br>=C2=A0#inc=
lude_next &lt;sys/types.h&gt;<br>=C2=A0<br>=C2=A0#ifndef __size_t</div><div=
><br></div><div>will filx the problem, but I can&#39;t test things easily e=
nough.</div><div><br></div><div>Warner<br></div></div><br><div class=3D"gma=
il_quote"><div dir=3D"ltr" class=3D"gmail_attr">On Wed, Jan 24, 2024 at 8:5=
1=E2=80=AFPM Ed Maste &lt;<a href=3D"mailto:emaste@freebsd.org">emaste@free=
bsd.org</a>&gt; wrote:<br></div><blockquote class=3D"gmail_quote" style=3D"=
margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-lef=
t:1ex">The branch main has been updated by emaste:<br>
<br>
URL: <a href=3D"https://cgit.FreeBSD.org/src/commit/?id=3Dfbd156d78fbdc5e19=
84afe4d83436b624e7a1f01" rel=3D"noreferrer" target=3D"_blank">https://cgit.=
FreeBSD.org/src/commit/?id=3Dfbd156d78fbdc5e1984afe4d83436b624e7a1f01</a><b=
r>
<br>
commit fbd156d78fbdc5e1984afe4d83436b624e7a1f01<br>
Author:=C2=A0 =C2=A0 =C2=A0Ed Maste &lt;emaste@FreeBSD.org&gt;<br>
AuthorDate: 2024-01-25 03:49:45 +0000<br>
Commit:=C2=A0 =C2=A0 =C2=A0Ed Maste &lt;emaste@FreeBSD.org&gt;<br>
CommitDate: 2024-01-25 03:50:49 +0000<br>
<br>
=C2=A0 =C2=A0 Revert &quot;nl_types.h: explicitly include cdefs.h&quot;<br>
<br>
=C2=A0 =C2=A0 This isn&#39;t the right approach for addressing this cross-b=
uild issue.<br>
<br>
=C2=A0 =C2=A0 This reverts commit 820401bf176996e41091d2e4190aded12a966b1d.=
<br>
---<br>
=C2=A0include/nl_types.h | 1 -<br>
=C2=A01 file changed, 1 deletion(-)<br>
<br>
diff --git a/include/nl_types.h b/include/nl_types.h<br>
index 6ba15132126d..120d1911631f 100644<br>
--- a/include/nl_types.h<br>
+++ b/include/nl_types.h<br>
@@ -34,7 +34,6 @@<br>
=C2=A0#ifndef _NL_TYPES_H_<br>
=C2=A0#define _NL_TYPES_H_<br>
<br>
-#include &lt;sys/cdefs.h&gt;<br>
=C2=A0#include &lt;sys/types.h&gt;<br>
<br>
=C2=A0#ifdef _NLS_PRIVATE<br>
</blockquote></div>

--00000000000030a393060fbde35b--