[flashrom] [commit] r1877 - trunk

[repository service]

Author: stefanct
Date: Mon Jan 26 23:06:04 2015
New Revision: 1877
URL: http://flashrom.org/trac/flashrom/changeset/1877

Log:
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.

Signed-off-by: Stefan Tauner <stefan.tauner at alumni.tuwien.ac.at>
Acked-by: Stefan Tauner <stefan.tauner at alumni.tuwien.ac.at>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>

Modified:
   trunk/Makefile
   trunk/dediprog.c

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Mon Jan 26 23:03:35 2015	(r1876)
+++ trunk/Makefile	Mon Jan 26 23:06:04 2015	(r1877)
@@ -843,7 +843,12 @@
 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;

Modified: trunk/dediprog.c
==============================================================================
--- trunk/dediprog.c	Mon Jan 26 23:03:35 2015	(r1876)
+++ trunk/dediprog.c	Mon Jan 26 23:06:04 2015	(r1877)
@@ -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"