diff --git a/ChangeLog b/ChangeLog index 41719ddd..682b31b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-05-02 Hannes Weisbach + + * avrftdi_private.h: Add libusb-1.0 include to fix include order in windows. + 2013-04-30 Hannes Weisbach * tpi.h: Add definition for TPI Identification Code diff --git a/avrftdi_private.h b/avrftdi_private.h index 5ff5b2cf..7ba39280 100644 --- a/avrftdi_private.h +++ b/avrftdi_private.h @@ -3,11 +3,11 @@ #include +#ifdef HAVE_LIBUSB_1_0 #ifdef HAVE_LIBFTDI1 -# include -#else -# error "libftdi1 required for avrftdi." -#endif + +#include +#include #include "pgm.h" @@ -59,3 +59,15 @@ typedef struct avrftdi_s { void avrftdi_print(int level, const char * fmt, ...); +#else /* HAVE_LIBFTDI1 */ + +#warning "libftdi1 required for programmer avrftdi." + +#endif /* HAVE_LIBFTDI1 */ + +#else /* HAVE_LIBUSB_1_0 */ + +#warning "libusb-1.0 required for programmer avrftdi." + +#endif /* HAVE_LIBUSB_1_0 */ +