Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 9 Apr 2021 20:47:07 GMT
From:      Konstantin Belousov <kib@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 34ca6025ddfe - main - rtld_lock.h: Expand scope for IN_RTLD to avoid some conflicts with libc
Message-ID:  <202104092047.139Kl7bh071459@gitrepo.freebsd.org>

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

URL: https://cgit.FreeBSD.org/src/commit/?id=34ca6025ddfea9899024eb6e7617091c5bc5149a

commit 34ca6025ddfea9899024eb6e7617091c5bc5149a
Author:     Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2021-04-05 04:12:22 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2021-04-09 20:46:23 +0000

    rtld_lock.h: Expand scope for IN_RTLD to avoid some conflicts with libc
    
    Sponsored by:   The FreeBSD Foundation
    MFC after:      1 week
    Differential revision:  https://reviews.freebsd.org/D29623
---
 libexec/rtld-elf/rtld_lock.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libexec/rtld-elf/rtld_lock.h b/libexec/rtld-elf/rtld_lock.h
index cc1fd83169f8..9aa769b1f7e6 100644
--- a/libexec/rtld-elf/rtld_lock.h
+++ b/libexec/rtld-elf/rtld_lock.h
@@ -46,10 +46,14 @@ struct RtldLockInfo
 	void  (*at_fork)(void);
 };
 
+#if defined(IN_RTLD) || defined(PTHREAD_KERNEL)
+
 void _rtld_thread_init(struct RtldLockInfo *) __exported;
 void _rtld_atfork_pre(int *) __exported;
 void _rtld_atfork_post(int *) __exported;
 
+#endif /* IN_RTLD || PTHREAD_KERNEL */
+
 #ifdef IN_RTLD
 
 struct rtld_lock;



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