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:
parent
e9944c32c0
commit
d02dc96ab5
|
@ -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
|
||||||
|
|
|
@ -3,11 +3,11 @@
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
|
#ifdef HAVE_LIBUSB_1_0
|
||||||
#ifdef HAVE_LIBFTDI1
|
#ifdef HAVE_LIBFTDI1
|
||||||
# include <libftdi1/ftdi.h>
|
|
||||||
#else
|
#include <libusb-1.0/libusb.h>
|
||||||
# error "libftdi1 required for avrftdi."
|
#include <libftdi1/ftdi.h>
|
||||||
#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 */
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue