On 19.01.2015 21:39, Stefan Tauner wrote:
libusb-win32 is using a different header file name for a while, use that on Windows builds to make clear that this is currently the correct header to include.
Yes, but at http://flashrom.org/Windows we still direct users to the old libusb-win32 version which uses the old usb.h. As long as those instructions are in the wiki, this will introduce additional breakage.
Hopefully this will change soonish with migrating away from libusb-0.
Signed-off-by: Stefan Tauner stefan.tauner@alumni.tuwien.ac.at Acked-by: Stefan Tauner stefan.tauner@alumni.tuwien.ac.at
Makefile | 5 +++++ dediprog.c | 8 ++++++++ 2 files changed, 13 insertions(+)
diff --git a/Makefile b/Makefile index 54ebfe4..03670d2 100644 --- a/Makefile +++ b/Makefile @@ -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;
We'd have to fix the wiki at the same time we commit this.
Regards, Carl-Daniel