diff options
| author | Adhemerval Zanella Netto <adhemerval.zanella@linaro.org> | 2022-10-26 16:04:23 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2022-12-28 15:47:27 -0300 |
| commit | f75f61b659ba738f3f7441b0cff832f9797630f4 (patch) | |
| tree | 9860a3776c88e3f76b690bb9babb305581b572a2 | |
| parent | ca97201c24761ebc47e52ac6b7fbd40bcb128292 (diff) | |
| download | glibc-f75f61b659ba738f3f7441b0cff832f9797630f4.tar.gz | |
nis: Build libnsl with 64 bit time_t
And remove the usage of glibc reserved names.
Reviewed-by: DJ Delorie <dj@redhat.com>
(cherry picked from commit 545eefc2f5da61801ba82b7a32ca2589b769ec90)
| -rw-r--r-- | Makeconfig | 2 | ||||
| -rw-r--r-- | nis/nis_call.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Makeconfig b/Makeconfig index 407058a6a8..8fca43d14e 100644 --- a/Makeconfig +++ b/Makeconfig @@ -887,7 +887,7 @@ endif # Use 64 bit time_t support for installed programs installed-modules = nonlib nscd lddlibc4 ldconfig locale_programs \ iconvprogs libnss_files libnss_compat libnss_db libnss_hesiod \ - libutil libpcprofile libSegFault + libutil libpcprofile libSegFault libnsl +extra-time-flags = $(if $(filter $(installed-modules),\ $(in-module)),-D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64) diff --git a/nis/nis_call.c b/nis/nis_call.c index 90187e30b1..5b9dd50151 100644 --- a/nis/nis_call.c +++ b/nis/nis_call.c @@ -574,7 +574,7 @@ static struct nis_server_cache unsigned int size; unsigned int server_used; unsigned int current_ep; - __time64_t expires; + time_t expires; char name[]; } *nis_server_cache[16]; static time_t nis_cold_start_mtime; @@ -583,7 +583,7 @@ __libc_lock_define_initialized (static, nis_server_cache_lock) static directory_obj * nis_server_cache_search (const_nis_name name, int search_parent, unsigned int *server_used, unsigned int *current_ep, - struct __timespec64 *now) + struct timespec *now) { directory_obj *ret = NULL; int i; @@ -641,7 +641,7 @@ nis_server_cache_search (const_nis_name name, int search_parent, static void nis_server_cache_add (const_nis_name name, int search_parent, directory_obj *dir, unsigned int server_used, - unsigned int current_ep, struct __timespec64 *now) + unsigned int current_ep, struct timespec *now) { struct nis_server_cache **loc; struct nis_server_cache *new; @@ -707,7 +707,7 @@ __nisfind_server (const_nis_name name, int search_parent, nis_error result = NIS_SUCCESS; nis_error status; directory_obj *obj; - struct __timespec64 ts; + struct timespec ts; unsigned int server_used = ~0; unsigned int current_ep = ~0; @@ -717,7 +717,7 @@ __nisfind_server (const_nis_name name, int search_parent, if (*dir != NULL) return NIS_SUCCESS; - __clock_gettime64 (CLOCK_REALTIME, &ts); + clock_gettime (CLOCK_REALTIME, &ts); if ((flags & NO_CACHE) == 0) *dir = nis_server_cache_search (name, search_parent, &server_used, |