From d7c246d112c1f8f944dc466bf09730910adcc0e7 Mon Sep 17 00:00:00 2001
From: joerg_wunsch <joerg_wunsch@81a1dc3b-b13d-400b-aceb-764788c761c2>
Date: Tue, 27 Jul 2010 16:06:01 +0000
Subject: [PATCH] bug #30566: MinGW + Ubuntu 9.04 * stk500v2.c (stk500v2_open):
use same condition to refer to the AVR Doper support as used in the
definition in ser_avrdoper.c. (Thanks to Christian Starkjohann for the
analysis of the problem.)
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@947 81a1dc3b-b13d-400b-aceb-764788c761c2
---
ChangeLog | 7 +++++++
stk500v2.c | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 7c7e7f49..4f4df927 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-07-27 Joerg Wunsch <j.gnu@uriah.heep.sax.de>
+
+ bug #30566: MinGW + Ubuntu 9.04
+ * stk500v2.c (stk500v2_open): use same condition to refer to the AVR
+ Doper support as used in the definition in ser_avrdoper.c.
+ (Thanks to Christian Starkjohann for the analysis of the problem.)
+
2010-07-19 Michal Ludvig <mludvig@logix.net.nz>
* buspirate.c: Added compatibility with BusPirate "NewUI" firmware 5.x
diff --git a/stk500v2.c b/stk500v2.c
index 3956223e..25f501be 100644
--- a/stk500v2.c
+++ b/stk500v2.c
@@ -1285,7 +1285,7 @@ static int stk500v2_open(PROGRAMMER * pgm, char * port)
PDATA(pgm)->pgmtype = PGMTYPE_UNKNOWN;
if(strcasecmp(port, "avrdoper") == 0){
-#if defined(HAVE_LIBUSB) || defined(WIN32NATIVE)
+#if defined(HAVE_LIBUSB) || (defined(WIN32NATIVE) && defined(HAVE_LIBHID))
serdev = &avrdoper_serdev;
PDATA(pgm)->pgmtype = PGMTYPE_STK500;
#else