From 876f79a141ff490b92c9ec08980bfe92ed8bf26b Mon Sep 17 00:00:00 2001 From: Joerg Wunsch Date: Sat, 29 Mar 2008 22:10:11 +0000 Subject: [PATCH] #undef interface for Win32 git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@770 81a1dc3b-b13d-400b-aceb-764788c761c2 --- ChangeLog | 4 ++++ usb_libusb.c | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/ChangeLog b/ChangeLog index aaa33d80..664ac2f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2008-03-24 Joerg Wunsch + + * usb_libusb.c: #undef interface for Win32 + 2008-03-24 Joerg Wunsch * avr910.c: Add support for the -x devcode option. diff --git a/usb_libusb.c b/usb_libusb.c index ce243ac3..25436272 100644 --- a/usb_libusb.c +++ b/usb_libusb.c @@ -42,6 +42,11 @@ #include "serial.h" #include "usbdevs.h" +#if defined(WIN32NATIVE) +/* someone has defined "interface" to "struct" in Cygwin */ +# undef interface +#endif + static char usbbuf[USBDEV_MAX_XFER]; static int buflen = -1, bufptr;