From: Ulrich Drepper Date: Wed, 13 Jun 2001 23:21:54 +0000 (+0000) Subject: Update. X-Git-Tag: cvs/pre-lgplv2_1~83 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d002205fd2688a6be32bed2e61ffa3192a0105be;p=thirdparty%2Fglibc.git Update. 2001-06-13 Ulrich Drepper * time/sys/time.h: Don't use enum __itimer_which ever for __itimer_which_t for C++. Reported by Martin Buchholz . * po/fr.po: Update from translation team. 2001-06-12 H.J. Lu 2001-06-11 Michael Deutschmann Michael Deutschmann --- diff --git a/ChangeLog b/ChangeLog index 976c18cc5f6..f30b7e8bd84 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,12 @@ -2001-06-12 H.J. Lu +2001-06-13 Ulrich Drepper + + * time/sys/time.h: Don't use enum __itimer_which ever for + __itimer_which_t for C++. + Reported by Martin Buchholz . + + * po/fr.po: Update from translation team. + +2001-06-12 H.J. Lu * configure.in: Fix typos in missing program names. * configure: Regenerated. @@ -19,14 +27,14 @@ * sysdeps/powerpc/fpu/libm-test-ulps: Add ULPs for tanh (-0.7). * sysdeps/s390/fpu/libm-test-ulps: Likewise. -2001-06-11 Michael Deutschmann +2001-06-11 Michael Deutschmann * rt/tst-aio4.c (do_test): Test whether rt signals are supported. Use my_signo instead of MY_SIGNO and initialize it so that the used signal is always available. 2001-06-11 Andreas Jaeger , - Michael Deutschmann + Michael Deutschmann * io/test-lfs.c (do_prepare): Clean up error messages. (test_ftello): Check for EFBIG and ENOSP, clean up error messages. diff --git a/time/sys/time.h b/time/sys/time.h index 031134011ca..4d55493bcde 100644 --- a/time/sys/time.h +++ b/time/sys/time.h @@ -112,7 +112,9 @@ struct itimerval struct timeval it_value; }; -#ifdef __USE_GNU +#if defined __USE_GNU && !defined __cplusplus +/* Use the nicer parameter type only in GNU mode and not for C++ since the + strict C++ rules prevent the automatic promotion. */ typedef enum __itimer_which __itimer_which_t; #else typedef int __itimer_which_t;