avr
/
avrdude
mirror of https://github.com/mariusgreuel/avrdude.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

avrftdi_private.h: Fix header include order in windows 

git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1153 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
hweisbach 2013-05-02 11:07:16 +00:00
parent d753dc6905
commit 7cc2b783a3
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2013-05-02 Hannes Weisbach <hannes_weisbach@gmx.net>
* avrftdi_private.h: Add libusb-1.0 include to fix include order in windows.
2013-04-30 Hannes Weisbach <hannes_weisbach@gmx.net> 2013-04-30 Hannes Weisbach <hannes_weisbach@gmx.net>
* tpi.h: Add definition for TPI Identification Code * tpi.h: Add definition for TPI Identification Code

18
avrftdi_private.h
View File

@ -3,11 +3,11 @@
#include <stdint.h> #include <stdint.h>
#ifdef HAVE_LIBUSB_1_0
#ifdef HAVE_LIBFTDI1 #ifdef HAVE_LIBFTDI1
#include <libusb-1.0/libusb.h>
#include <libftdi1/ftdi.h> #include <libftdi1/ftdi.h>
#else
# error "libftdi1 required for avrftdi."
#endif
#include "pgm.h" #include "pgm.h"
@ -59,3 +59,15 @@ typedef struct avrftdi_s {
void avrftdi_print(int level, const char * fmt, ...); 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 */