Fix GCC compilation issues in cherrypicks

This commit is contained in:
Stan Shebs 2018-03-28 19:31:45 -07:00
parent 476f7cf2f2
commit 349ff1d0d5
3 changed files with 4 additions and 2 deletions

View File

@ -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); \
\

View File

@ -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();

View File

@ -59,4 +59,6 @@ time (time_t *t)
#endif
#if defined(__clang__)
libc_hidden_weak (time)
#endif