reduce diff to upstream

14 years ago · 0223193ede
parent 0f8cd797d6
commit 0223193ede
3 changed files with 5 additions and 5 deletions
--- a/projekte/protothreads/Makefile
+++ b/projekte/protothreads/Makefile
@ -32,7 +32,7 @@ CSTANDARD = -std=gnu99
 CDEFS = -DF_CPU=$(F_CPU)UL

 # Place -I options here
-CINCS = -Ipt 
+CINCS = -Ipt -Itimer


 CDEBUG = -g$(DEBUG)
--- a/projekte/protothreads/example.c
+++ b/projekte/protothreads/example.c
@ -4,8 +4,8 @@
 #include "util/delay.h"

 #include "pt.h"
-#include "timer/clock.h"
-#include "timer/timer.h"
+#include "clock.h"
+#include "timer.h"

 /* TIMER_DELAY macro for convenience */
 #define TIMER_DELAY(pt, timer, t) \
--- a/projekte/protothreads/timer/timer.c
+++ b/projekte/protothreads/timer/timer.c
@ -45,8 +45,8 @@
 * $Id: timer.c,v 1.2 2006/06/12 08:00:30 adam Exp $
 */

-#include "timer/clock.h"
-#include "timer/timer.h"
+#include "clock.h"
+#include "timer.h"

 /*---------------------------------------------------------------------------*/
 /**