summaryrefslogtreecommitdiff
path: root/time
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-06-13 23:21:54 +0000
committerUlrich Drepper <drepper@redhat.com>2001-06-13 23:21:54 +0000
commitd002205fd2688a6be32bed2e61ffa3192a0105be (patch)
tree1881eb94009475097445258d2f8c46625eaa5dc5 /time
parentbad6065c9735bfe391439cb76adc84c101438ec0 (diff)
downloadglibc-d002205fd2688a6be32bed2e61ffa3192a0105be.tar.gz
Update.
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> 2001-06-11 Michael Deutschmann <michael@talamasca.ocis.net> Michael Deutschmann <michael@talamasca.ocis.net>
Diffstat (limited to 'time')
-rw-r--r--time/sys/time.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/time/sys/time.h b/time/sys/time.h
index 031134011c..4d55493bcd 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;