commit 4b7735faa8db4e6f204a3c764cb38530ec98959a
author David Schneider <dnschneid@chromium.org> Fri Jan 18 19:44:36 2013
committer ChromeBot <chrome-bot@google.com> Wed Mar 06 20:05:44 2013
tree fc5e91343bd872db27ca8638a0fe0fa84d3c6487
parent ed991023b4a56185ec6fdae1eafa5bf832cf347d

Include libusb.h when using libftdi1.

libftdi1 originally included libusb.h for us in their header; they have since
cleaned this up, requiring us to do it explicitly.

This does not affect libftdi0.

BUG=None
TEST=Succesfully compiled against both old and new libftdis.

Change-Id: I1e4b3c2859191b02e2fe1922045f30dc1c3d36da
Reviewed-on: https://gerrit.chromium.org/gerrit/41654
Commit-Queue: David Schneider <dnschneid@chromium.org>
Reviewed-by: David Schneider <dnschneid@chromium.org>
Tested-by: David Schneider <dnschneid@chromium.org>

src/toad/toad.c

diff --git a/src/toad/toad.c b/src/toad/toad.c
index ae09728..67d1690 100644
--- a/src/toad/toad.c
+++ b/src/toad/toad.c
@@ -77,6 +77,10 @@
 
 #include "toad.h"
 
+#if NEW_LIBFTDI
+#   include <libusb.h>
+#endif
+
 
 /* Options for passing into getopt_long */
 static const char *SHORT_OPTS = "s:f";