From d002205fd2688a6be32bed2e61ffa3192a0105be Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 13 Jun 2001 23:21:54 +0000 Subject: 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 --- time/sys/time.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'time/sys/time.h') 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; -- cgit 1.4.1