Merge pull request #314 from oliverschmidt/master

Recent changes in telnetd make exporting of those two necessary.
contiki-os · Jul 30, 2013 · c259e6a · c259e6a
2 parents ff2ecfd + ff5d6e0
commit c259e6a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/core/sys/timer.h b/core/sys/timer.h
@@ -88,10 +88,10 @@ struct timer {
   clock_time_t interval;
 };
 
-void timer_set(struct timer *t, clock_time_t interval);
+CCIF void timer_set(struct timer *t, clock_time_t interval);
 void timer_reset(struct timer *t);
 void timer_restart(struct timer *t);
-int timer_expired(struct timer *t);
+CCIF int timer_expired(struct timer *t);
 clock_time_t timer_remaining(struct timer *t);