mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-21 12:30:06 +00:00
nis: Build libnsl with 64 bit time_t
And remove the usage of glibc reserved names. Reviewed-by: DJ Delorie <dj@redhat.com>
This commit is contained in:
parent
f4f2ca1509
commit
545eefc2f5
@ -884,7 +884,7 @@ endif
|
||||
# Use 64 bit time_t support for installed programs
|
||||
installed-modules = nonlib nscd ldconfig locale_programs \
|
||||
iconvprogs libnss_files libnss_compat libnss_db libnss_hesiod \
|
||||
libutil libpcprofile
|
||||
libutil libpcprofile libnsl
|
||||
+extra-time-flags = $(if $(filter $(installed-modules),\
|
||||
$(in-module)),-D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64)
|
||||
|
||||
|
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user