From: Ulrich Drepper Date: Wed, 29 Sep 2004 17:52:21 +0000 (+0000) Subject: Update. X-Git-Tag: cvs/fedora-glibc-20040930T0838~16 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c1d74a94d42f41697e047c69c70da4b5c5fea59;p=thirdparty%2Fglibc.git Update. 2004-09-29 Ulrich Drepper * sysdeps/unix/sysv/linux/ia64/bits/siginfo.h (si_segvflags): Renamed from si+flags due to comflict with si_flags from . --- diff --git a/ChangeLog b/ChangeLog index 68c6472eac2..df5d90c724e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-09-29 Ulrich Drepper + + * sysdeps/unix/sysv/linux/ia64/bits/siginfo.h (si_segvflags): + Renamed from si+flags due to comflict with si_flags from . + 2004-09-28 Ulrich Drepper * nscd/nscd_getai.c: Use NO_MAPPING instead of MAP_FAILED for test diff --git a/sysdeps/unix/sysv/linux/ia64/bits/siginfo.h b/sysdeps/unix/sysv/linux/ia64/bits/siginfo.h index 52d00e9da94..66310c65b30 100644 --- a/sysdeps/unix/sysv/linux/ia64/bits/siginfo.h +++ b/sysdeps/unix/sysv/linux/ia64/bits/siginfo.h @@ -122,11 +122,11 @@ typedef struct siginfo # define si_band _sifields._sigpoll.si_band # define si_fd _sifields._sigpoll.si_fd -#ifdef __USE_GNU +# ifdef __USE_GNU # define si_imm _sifields._sigfault._si_imm -# define si_flags _sifields._sigfault._si_flags +# define si_segvflags _sifields._sigfault._si_flags # define si_isr _sifields._sigfault._si_isr -#endif +# endif /* Values for `si_code'. Positive values are reserved for kernel-generated signals. */