From f83c7164365526788d69128a506d81777e4092b3 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 17 Dec 2002 00:06:01 +0000 Subject: [PATCH] Update. 2002-12-16 Art Haas * io/ftw.c: Convert GCC extension initializer syntax to C99. --- ChangeLog | 4 ++++ io/ftw.c | 4 ++-- sysdeps/generic/bp-semctl.h | 2 +- sysdeps/unix/sysv/aix/setitimer.c | 2 +- sysdeps/unix/sysv/aix/sleep.c | 2 +- sysdeps/unix/sysv/aix/usleep.c | 2 +- 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index dce430be98..6109d82e70 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2002-12-16 Art Haas + + * io/ftw.c: Convert GCC extension initializer syntax to C99. + 2002-12-16 Ulrich Drepper * sysdeps/unix/sysv/linux/syscalls.list: Add epoll_create, diff --git a/io/ftw.c b/io/ftw.c index 0b4565fedf..0ff5947ee4 100644 --- a/io/ftw.c +++ b/io/ftw.c @@ -1,5 +1,5 @@ /* File tree walker functions. - Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc. + Copyright (C) 1996-2001, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1996. @@ -138,7 +138,7 @@ add_object (struct ftw_data *data, struct STAT *st) static inline int find_object (struct ftw_data *data, struct STAT *st) { - struct known_object obj = { dev: st->st_dev, ino: st->st_ino }; + struct known_object obj = { .dev = st->st_dev, .ino = st->st_ino }; return __tfind (&obj, &data->known_objects, object_compare) != NULL; } diff --git a/sysdeps/generic/bp-semctl.h b/sysdeps/generic/bp-semctl.h index 39f210ef51..d33ed2b356 100644 --- a/sysdeps/generic/bp-semctl.h +++ b/sysdeps/generic/bp-semctl.h @@ -41,7 +41,7 @@ check_semctl (union semun *arg, int semid, int cmd) case SETALL: { struct semid_ds ds; - union semun un = { buf: &ds }; + union semun un = { .buf = &ds }; unsigned int length = ~0; /* It's unfortunate that we need to make a recursive diff --git a/sysdeps/unix/sysv/aix/setitimer.c b/sysdeps/unix/sysv/aix/setitimer.c index e40a075fa9..d7e741abe7 100644 --- a/sysdeps/unix/sysv/aix/setitimer.c +++ b/sysdeps/unix/sysv/aix/setitimer.c @@ -56,7 +56,7 @@ __setitimer (which, new, old) case -1: exit(-1); case 0: { - struct timespec ts ={tv_sec:(long int)new->it_value.tv_sec,tv_nsec:0}; + struct timespec ts ={.tv_sec = (long int)new->it_value.tv_sec, .tv_nsec = 0}; __libc_nanosleep(&ts,&ts); __kill(getppid(), SIGALRM); exit(0); diff --git a/sysdeps/unix/sysv/aix/sleep.c b/sysdeps/unix/sysv/aix/sleep.c index 17a9702633..aa8d76d3d2 100644 --- a/sysdeps/unix/sysv/aix/sleep.c +++ b/sysdeps/unix/sysv/aix/sleep.c @@ -27,7 +27,7 @@ unsigned int __sleep (seconds) unsigned int seconds; { - struct timespec ts ={tv_sec:(long int)seconds,tv_nsec:0}; + struct timespec ts ={.tv_sec = (long int)seconds, .tv_nsec = 0}; __libc_nanosleep(&ts,&ts); return 0; } diff --git a/sysdeps/unix/sysv/aix/usleep.c b/sysdeps/unix/sysv/aix/usleep.c index e34fd0882d..a1d55eb2bc 100644 --- a/sysdeps/unix/sysv/aix/usleep.c +++ b/sysdeps/unix/sysv/aix/usleep.c @@ -28,7 +28,7 @@ int usleep (useconds) useconds_t useconds; { - struct timespec ts ={tv_sec:0,tv_nsec:(long int)useconds * 1000}; + struct timespec ts ={.tv_sec = 0, .tv_nsec = (long int)useconds * 1000}; __libc_nanosleep(&ts,&ts); return 0; }