mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-04 10:50:07 +00:00
Fix GCC compilation issues in cherrypicks
This commit is contained in:
parent
476f7cf2f2
commit
349ff1d0d5
@ -66,7 +66,7 @@
|
||||
dst_len = (l)->l_origin == (char *) -1 \
|
||||
? 0 : strlen ((l)->l_origin); \
|
||||
\
|
||||
char *exec_origin = GLRO(google_exec_origin_dir); \
|
||||
const char *exec_origin = GLRO(google_exec_origin_dir); \
|
||||
size_t exec_origin_len = \
|
||||
(exec_origin == NULL) ? 0 : strlen (exec_origin); \
|
||||
\
|
||||
|
@ -70,7 +70,7 @@ static enum nss_status _nss_borg_endpwent_locked(void) {
|
||||
// _nss_borg_endpwent()
|
||||
// Called by NSS to close the passwd file
|
||||
|
||||
enum nss_status _nss_borg_endpwent() {
|
||||
enum nss_status _nss_borg_endpwent(void) {
|
||||
enum nss_status ret;
|
||||
NSSBORG_LOCK;
|
||||
ret = _nss_borg_endpwent_locked();
|
||||
|
@ -59,4 +59,6 @@ time (time_t *t)
|
||||
|
||||
#endif
|
||||
|
||||
#if defined(__clang__)
|
||||
libc_hidden_weak (time)
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user