From 79011bae80ab000d513a36754a857b272cded593 Mon Sep 17 00:00:00 2001 From: laforge Date: Sun, 1 Oct 2006 20:30:41 +0000 Subject: fix gcc complains about 'alarm' shadowing a global declaration git-svn-id: https://svn.openpcd.org:2342/trunk@243 6dc7ffe9-61d6-0310-9af1-9938baff3ed1 --- firmware/include/lib_AT91SAM7.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'firmware') diff --git a/firmware/include/lib_AT91SAM7.h b/firmware/include/lib_AT91SAM7.h index 63943e3..f26ac54 100644 --- a/firmware/include/lib_AT91SAM7.h +++ b/firmware/include/lib_AT91SAM7.h @@ -1320,9 +1320,9 @@ static inline void AT91F_RTTClearRttIncINT( //* \brief Set RTT Alarm Value //*-------------------------------------------------------------------------------------- static inline void AT91F_RTTSetAlarmValue( - AT91PS_RTTC pRTTC, unsigned int alarm) + AT91PS_RTTC pRTTC, unsigned int _alarm) { - pRTTC->RTTC_RTAR = alarm; + pRTTC->RTTC_RTAR = _alarm; } //*-------------------------------------------------------------------------------------- -- cgit v1.2.3