diff options
| author | Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at> | 2015-01-26 22:06:04 +0000 |
|---|---|---|
| committer | Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at> | 2015-01-26 22:06:04 +0000 |
| commit | 0cbd8c2558209432a0f51522cd2adffc59785dd0 (patch) | |
| tree | 1d6ba57e182cb443c6296ae6faeed74ea8c1935f | |
| parent | e37735a99438f496a066d2ee86e55edc771730bb (diff) | |
| download | flashrom-0cbd8c2558209432a0f51522cd2adffc59785dd0.tar.gz flashrom-0cbd8c2558209432a0f51522cd2adffc59785dd0.tar.bz2 flashrom-0cbd8c2558209432a0f51522cd2adffc59785dd0.zip | |
Properly include current libusb-win32 header
libusb-win32 is using a different header file name (lusb0_usb.h) for
a while. Use that on Windows builds to make clear that this is
currently the correct header to include.
Hopefully this will change soonish by migrating away from libusb-0.
Corresponding to flashrom svn r1877.
Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | dediprog.c | 8 |
2 files changed, 13 insertions, 0 deletions
@@ -843,7 +843,12 @@ endef export LIBPCI_TEST define LIBUSB0_TEST +#include "platform.h" +#if IS_WINDOWS +#include <lusb0_usb.h> +#else #include <usb.h> +#endif int main(int argc, char **argv) { (void) argc; diff --git a/dediprog.c b/dediprog.c index 71a9f8bda..424849916 100644 --- a/dediprog.c +++ b/dediprog.c @@ -17,11 +17,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "platform.h" + #include <stdio.h> #include <string.h> #include <limits.h> #include <errno.h> + +#if IS_WINDOWS +#include <lusb0_usb.h> +#else #include <usb.h> +#endif + #include "flash.h" #include "chipdrivers.h" #include "programmer.h" |