aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog14
-rw-r--r--time/sys/time.h4
2 files changed, 14 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 976c18c..f30b7e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
-2001-06-12 H.J. Lu <hjl@gnu.org>
+2001-06-13 Ulrich Drepper <drepper@redhat.com>
+
+ * time/sys/time.h: Don't use enum __itimer_which ever for
+ __itimer_which_t for C++.
+ Reported by Martin Buchholz <martin@xemacs.org>.
+
+ * po/fr.po: Update from translation team.
+
+2001-06-12 H.J. Lu <hjl@gnu.org>
* 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 <michael@talamasca.ocis.net>
+2001-06-11 Michael Deutschmann <michael@talamasca.ocis.net>
* 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 <aj@suse.de>,
- Michael Deutschmann <michael@talamasca.ocis.net>
+ Michael Deutschmann <michael@talamasca.ocis.net>
* 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 0311340..4d55493 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;