deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

merge change from branch into mainline. <fingers crossed>

Browse source
This commit is contained in:
anthony-a 2010-04-06 19:10:21 +00:00
parent 75dd41601b
commit 694e1498f4
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/sys/timetable.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: timetable.c,v 1.3 2009/09/09 21:10:35 adamdunkels Exp $ * $Id: timetable.c,v 1.4 2010/04/06 19:10:21 anthony-a Exp $
*/ */
/** /**
@ -71,7 +71,11 @@ rtimer_clock_t
timetable_timediff(struct timetable *t, timetable_timediff(struct timetable *t,
const char *id1, const char *id2) const char *id1, const char *id2)
{ {
#ifdef SDCC_mcs51
char i; /* SDCC tracker 2982753 */
#else
int i; int i;
#endif
int t1, t2; int t1, t2;
t1 = t2 = t->size; t1 = t2 = t->size;