From 8cac677ca7d2d4d726aae797da45d06eee626ad7 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 31 Dec 2002 00:06:24 +0000 Subject: Update. 2002-12-30 Jakub Jelinek * forward.c: Make all functions available by default again. It caused too much trouble. * internals.h (struct pthread_functions): Rename ptr_pthread_exit and ptr_pthread_attr_init_2_* to ptr___pthread_exit and ptr___pthread_attr_init_2_*. * pthread.c (pthread_functions): Adjust. --- sysdeps/unix/sysv/linux/xstatconv.c | 54 +++++++++++++------------------------ 1 file changed, 18 insertions(+), 36 deletions(-) (limited to 'sysdeps/unix/sysv/linux/xstatconv.c') diff --git a/sysdeps/unix/sysv/linux/xstatconv.c b/sysdeps/unix/sysv/linux/xstatconv.c index d1f5e17..063489a 100644 --- a/sysdeps/unix/sysv/linux/xstatconv.c +++ b/sysdeps/unix/sysv/linux/xstatconv.c @@ -60,18 +60,12 @@ xstat_conv (int vers, struct kernel_stat *kbuf, void *ubuf) buf->st_size = kbuf->st_size; buf->st_blksize = kbuf->st_blksize; buf->st_blocks = kbuf->st_blocks; - buf->st_atime = kbuf->st_atime; -#ifdef _HAVE_STAT___UNUSED1 - buf->__unused1 = 0; -#endif - buf->st_mtime = kbuf->st_mtime; -#ifdef _HAVE_STAT___UNUSED2 - buf->__unused2 = 0; -#endif - buf->st_ctime = kbuf->st_ctime; -#ifdef _HAVE_STAT___UNUSED3 - buf->__unused3 = 0; -#endif + buf->st_atim.tv_sec = kbuf->st_atim.tv_sec; + buf->st_atim.tv_nsec = kbuf->st_atim.tv_nsec; + buf->st_mtim.tv_sec = kbuf->st_mtim.tv_sec; + buf->st_mtim.tv_nsec = kbuf->st_mtim.tv_nsec; + buf->st_ctim.tv_sec = kbuf->st_ctim.tv_sec; + buf->st_ctim.tv_nsec = kbuf->st_ctim.tv_nsec; #ifdef _HAVE_STAT___UNUSED4 buf->__unused4 = 0; #endif @@ -121,18 +115,12 @@ xstat64_conv (int vers, struct kernel_stat *kbuf, void *ubuf) buf->st_size = kbuf->st_size; buf->st_blksize = kbuf->st_blksize; buf->st_blocks = kbuf->st_blocks; - buf->st_atime = kbuf->st_atime; -#ifdef _HAVE_STAT64___UNUSED1 - buf->__unused1 = 0; -#endif - buf->st_mtime = kbuf->st_mtime; -#ifdef _HAVE_STAT64___UNUSED2 - buf->__unused2 = 0; -#endif - buf->st_ctime = kbuf->st_ctime; -#ifdef _HAVE_STAT64___UNUSED3 - buf->__unused3 = 0; -#endif + buf->st_atim.tv_sec = kbuf->st_atim.tv_sec; + buf->st_atim.tv_nsec = kbuf->st_atim.tv_nsec; + buf->st_mtim.tv_sec = kbuf->st_mtim.tv_sec; + buf->st_mtim.tv_nsec = kbuf->st_mtim.tv_nsec; + buf->st_ctim.tv_sec = kbuf->st_ctim.tv_sec; + buf->st_ctim.tv_nsec = kbuf->st_ctim.tv_nsec; #ifdef _HAVE_STAT64___UNUSED4 buf->__unused4 = 0; #endif @@ -216,18 +204,12 @@ xstat32_conv (int vers, struct stat64 *kbuf, struct stat *buf) __set_errno (EOVERFLOW); return -1; } - buf->st_atime = kbuf->st_atime; -#ifdef _HAVE_STAT___UNUSED1 - buf->__unused1 = 0; -#endif - buf->st_mtime = kbuf->st_mtime; -#ifdef _HAVE_STAT___UNUSED2 - buf->__unused2 = 0; -#endif - buf->st_ctime = kbuf->st_ctime; -#ifdef _HAVE_STAT___UNUSED3 - buf->__unused3 = 0; -#endif + buf->st_atim.tv_sec = kbuf->st_atim.tv_sec; + buf->st_atim.tv_nsec = kbuf->st_atim.tv_nsec; + buf->st_mtim.tv_sec = kbuf->st_mtim.tv_sec; + buf->st_mtim.tv_nsec = kbuf->st_mtim.tv_nsec; + buf->st_ctim.tv_sec = kbuf->st_ctim.tv_sec; + buf->st_ctim.tv_nsec = kbuf->st_ctim.tv_nsec; #ifdef _HAVE_STAT___UNUSED4 buf->__unused4 = 0; #endif -- cgit v1.1