From nobody Mon Nov 27 05:25:18 2023 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 4SdvDb4pftz51hR3; Mon, 27 Nov 2023 05:25:19 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SdvDb1PZCz4Y3f; Mon, 27 Nov 2023 05:25:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x2yV+5412wPxV2wORS2HMjehI0VmWprxTPCyUGhQ+6U=; b=wL/aY/9qyZDs01Mjl/23y113WqOm3exJg/CThMyfL3Xn7KmFQ009TQ5NRR+BxGIjA4zGxm Bds7kgmtQ5UevJ0KXQIRqK0G4djRbGAprPYe7B1K3EiRNgFc6MA7n8fqXX+EB6JMxHihoz P0YCRJjsbHNacDxdjYHSP/XeWm8WmG+dAuiCCm3Ry/7aOuUjXA+ys1f5u5/gBdr19OkCy6 z7q5XpP8+LwFSyLhiIKGmnQBSriK25N/KENqS9qQXLjkx8mB4ts30dSvRnKuNv+6ylHh31 5XsiKwnFsJofO9+RlafSfLtF7zRuToI+zP92lY3OtDOTTOwrRWa2FAcH73AOZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x2yV+5412wPxV2wORS2HMjehI0VmWprxTPCyUGhQ+6U=; b=Jg6yShzBQt26v0ywW7KE3vFCvBYoge3Sv+XH4wdKLJBfg2HbS1Axq9PxFv90Oe1okzbN33 09cNAYwfqZwNGjxqJpN5aausZaCn3f9Flen5dZ0CeptW4/VY1y8ZKtXuR57BZfNr2Ohgna 5r6iTvDTceegI02M+Rw9irgSEQE8i9/Pc0lTCN143V73wuYwsk02esewA75rJPsUag7Rbc MBoeBOpxFxk3cVe8FSp3ksFK3E/Y+fp8q6NYAbQZMmfXtXa4wNfHn8Rq5uKp3//+Rlmk+F sKLbuU86p9rMfVmDtGnWRu1inIe7Ws7W7NV00yh8Qq9l5WjsF7DdQ+gXFtunCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701062719; a=rsa-sha256; cv=none; b=biYGLaJEKtq8Qlj7gZCDNxhKA8Ak93egqtHlfiwQCA3hrQBmTc5fulR7WlxiWwSxLGgKJX P3DFxJKaX/OXfDvAPX9x7rHucXMYmx+WUUBAtNsGARUc3wNAJMM8yRj0YoyeKSflXu86as Sa5ztLV1Inxlwns6DM0R9Vfze9Vl7i1VLxrmaUeooV+uhgYdBFRGUS3sQmigmdowAqQv7j Xb+ydmyK5VY71RwmaP1EXLEMoTYsH3mPIPFP9PCWnyyr3l0fV3etZzgROnIKTm2sNNDK6L 6YkAuOlIFcX2d3n+wMh0ZG0tfgxzHwlXpw/VqICq/l/bsOtC4m8dHs1N43K6aQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdvDb0ShQzBJx; Mon, 27 Nov 2023 05:25:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AR5PIEY067336; Mon, 27 Nov 2023 05:25:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AR5PIvb067333; Mon, 27 Nov 2023 05:25:18 GMT (envelope-from git) Date: Mon, 27 Nov 2023 05:25:18 GMT Message-Id: <202311270525.3AR5PIvb067333@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 042f0f00c24b - main - cdefs: Move GNUC_PREREQ to top of file List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 042f0f00c24b62dcd432a4ca2980467f2adef65e Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=042f0f00c24b62dcd432a4ca2980467f2adef65e commit 042f0f00c24b62dcd432a4ca2980467f2adef65e Author: Warner Losh AuthorDate: 2023-11-20 23:09:55 +0000 Commit: Warner Losh CommitDate: 2023-11-27 05:24:02 +0000 cdefs: Move GNUC_PREREQ to top of file It really should be closer to the the top of the file, so move it to the start of the compiler specific section. PR: 275221 (exp-run) Sponsored by: Netflix --- sys/sys/cdefs.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index 7f3efc9300c9..c5b6190077b3 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -72,6 +72,16 @@ * having a compiler-agnostic source tree. */ +/* + * Macro to test if we're using a specific version of gcc or later. + */ +#if defined(__GNUC__) +#define __GNUC_PREREQ__(ma, mi) \ + (__GNUC__ > (ma) || __GNUC__ == (ma) && __GNUC_MINOR__ >= (mi)) +#else +#define __GNUC_PREREQ__(ma, mi) 0 +#endif + #if defined(__GNUC__) /* @@ -83,16 +93,6 @@ #endif /* __GNUC__ */ -/* - * Macro to test if we're using a specific version of gcc or later. - */ -#if defined(__GNUC__) -#define __GNUC_PREREQ__(ma, mi) \ - (__GNUC__ > (ma) || __GNUC__ == (ma) && __GNUC_MINOR__ >= (mi)) -#else -#define __GNUC_PREREQ__(ma, mi) 0 -#endif - /* * The __CONCAT macro is used to concatenate parts of symbol names, e.g. * with "#define OLD(foo) __CONCAT(old,foo)", OLD(foo) produces oldfoo.