Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 14 Nov 2024 14:58:22 GMT
From:      John Baldwin <jhb@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 9d4428ad0239 - main - <sys/libkern.h>: Don't include <ssp/ssp.h> in the kernel
Message-ID:  <202411141458.4AEEwMe5006770@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=9d4428ad0239c9d0c2795a7b34caa726873d963e

commit 9d4428ad0239c9d0c2795a7b34caa726873d963e
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2024-11-14 14:57:29 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2024-11-14 14:58:09 +0000

    <sys/libkern.h>: Don't include <ssp/ssp.h> in the kernel
    
    Reviewed by:    kevans
    Obtained from:  CheriBSD
    Sponsored by:   AFRL, DARPA
    Differential Revision:  https://reviews.freebsd.org/D47519
---
 sys/sys/libkern.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/sys/libkern.h b/sys/sys/libkern.h
index ad64d0fb0a57..b9d395ba151f 100644
--- a/sys/sys/libkern.h
+++ b/sys/sys/libkern.h
@@ -334,7 +334,7 @@ signed_extend32(uint32_t bitmap, int lsb, int width)
 #define	FNM_IGNORECASE	FNM_CASEFOLD
 #define	FNM_FILE_NAME	FNM_PATHNAME
 
-#if __has_include(<ssp/ssp.h>)
+#if !defined(_KERNEL) && __has_include(<ssp/ssp.h>)
 #include <ssp/ssp.h>	/* __ssp_real */
 #else
 #define __ssp_real(fun)		fun



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202411141458.4AEEwMe5006770>