diff options
author | Joseph Myers <joseph@codesourcery.com> | 2015-08-19 00:50:17 +0000 |
---|---|---|
committer | Joseph Myers <joseph@codesourcery.com> | 2015-08-19 00:50:17 +0000 |
commit | ccb729df47188874401c655dda8d47b55cddd3b7 (patch) | |
tree | 9eff454138a987d54cef376b6c84c3b626f5986a /ChangeLog | |
parent | 87336caeb5e5169575b8cba510cdbb71287c0514 (diff) | |
download | glibc-ccb729df47188874401c655dda8d47b55cddd3b7.tar.gz glibc-ccb729df47188874401c655dda8d47b55cddd3b7.tar.xz glibc-ccb729df47188874401c655dda8d47b55cddd3b7.zip |
Fix -Wundef warnings in login/tst-utmp.c.
To remove -Wno-error=undef, we need to fix the remaining cases where there are -Wundef warnings in the testsuite. One of those places is in login/tst-utmp.c. When included from tst-utmpx.c, <utmpx.h> is included instead of <utmp.h>, meaning the _HAVE_UT_* macros are not defined. The test is prepared for them not being defined, in that all the relevant conditionals also include "defined UTMPX". However, they test the _HAVE_UT_* macros first, so resulting in -Wundef warnings. This patch does the minimal fix of swapping the || operands. This is logically correct - avoiding checking a macro we know will not be defined in the case where it is not defined. It won't fix such warnings for the case where the toplevel bits/utmp.h is used and most _HAVE_UT_* aren't defined at all even when <utmp.h> is included, but that case doesn't apply to any current glibc configuration. Fixing it would also be tricky in that, while glibc itself consistently uses _HAVE_UT_* in ways that would work with 0 instead of undefined, external packages that use the macros expect defined / undefined instead of 1 / 0 (codesearch.debian.net shows uses by util-linux, python-utmp, libsys-utmp-perl). Tested for x86_64. * login/tst-utmp.c [_HAVE_UT_TYPE || defined UTMPX]: Change conditional to [defined UTMPX || _HAVE_UT_TYPE]. [_HAVE_UT_TV || defined UTMPX]: Change conditional to [defined UTMPX || _HAVE_UT_TV]. [_HAVE_UT_TV - 0 || defined UTMPX]: Change conditional to [defined UTMPX || _HAVE_UT_TV - 0].
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 0daf15eeb9..da9a3e0851 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2015-08-19 Joseph Myers <joseph@codesourcery.com> + + * login/tst-utmp.c [_HAVE_UT_TYPE || defined UTMPX]: Change + conditional to [defined UTMPX || _HAVE_UT_TYPE]. + [_HAVE_UT_TV || defined UTMPX]: Change conditional to [defined + UTMPX || _HAVE_UT_TV]. + [_HAVE_UT_TV - 0 || defined UTMPX]: Change conditional to [defined + UTMPX || _HAVE_UT_TV - 0]. + 2015-08-18 Joseph Myers <joseph@codesourcery.com> * sysdeps/mips/dl-machine.h [__mips_isa_rev < 6]: Change |