From d02dc96ab50d2b9deba8f9d9958d50769776914c Mon Sep 17 00:00:00 2001
From: Hannes Weisbach <hannes_weisbach@gmx.net>
Date: Thu, 2 May 2013 11:07:16 +0000
Subject: [PATCH] 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
---
 ChangeLog         |  4 ++++
 avrftdi_private.h | 20 ++++++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 41719ddd..682b31b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
 	* 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 <stdint.h>
 
+#ifdef HAVE_LIBUSB_1_0
 #ifdef HAVE_LIBFTDI1
-#  include <libftdi1/ftdi.h>
-#else
-#  error "libftdi1 required for avrftdi."
-#endif
+
+#include <libusb-1.0/libusb.h>
+#include <libftdi1/ftdi.h>
 
 #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 */
+