diff --git a/jtag/ChangeLog b/jtag/ChangeLog index eb26a776..72ec4c60 100644 --- a/jtag/ChangeLog +++ b/jtag/ChangeLog @@ -1,3 +1,9 @@ +2008-12-23 Kolja Waschk + + * src/cmd/usleep.c, sysdep.h: usleep() is declared in + unistd.h, also present in modern MinGW environments. + Defining it in sysdep.h collides with unistd.h. + 2008-12-22 Arnim Laeuger * src/tap/cable/usbblaster.c: diff --git a/jtag/src/cmd/usleep.c b/jtag/src/cmd/usleep.c index 07ff4f44..c2dd8c3e 100644 --- a/jtag/src/cmd/usleep.c +++ b/jtag/src/cmd/usleep.c @@ -24,6 +24,8 @@ #include "sysdep.h" +#include + #include #include diff --git a/jtag/sysdep.h b/jtag/sysdep.h index 52feb74d..f6c6db6d 100644 --- a/jtag/sysdep.h +++ b/jtag/sysdep.h @@ -48,7 +48,6 @@ #include #define geteuid() 0 #define getuid() 0 -#define usleep(x) Sleep(x/1E3) #endif #endif /* SYSDEP_H */