* pickit2.c: reordered #includes for non-usb configuration

git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1122 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
Rene Liebscher 2012-12-03 20:50:11 +00:00
parent 62f798bc54
commit e61690b142
4 changed files with 9 additions and 9 deletions

View File

@ -21,6 +21,7 @@ Contributors:
Hannes Weisbach Hannes Weisbach
Doug Springer Doug Springer
Brett Hagman <bhagman@roguerobotics.com> Brett Hagman <bhagman@roguerobotics.com>
Rene Liebscher <r.liebscher@gmx.de>
For minor contributions, please see the ChangeLog files. For minor contributions, please see the ChangeLog files.

View File

@ -1,3 +1,7 @@
2012-12-03 Rene Liebscher <R.Liebscher@gmx.de>
* pickit2.c: reordered #includes for non-usb configuration
2012-12-03 Joerg Wunsch <j.gnu@uriah.heep.sax.de> 2012-12-03 Joerg Wunsch <j.gnu@uriah.heep.sax.de>
* jtag3.c: Enable interactive adjustment of the various * jtag3.c: Enable interactive adjustment of the various

2
NEWS
View File

@ -35,6 +35,8 @@ Current:
X3(1), sck = DSR X3(2), mosi = DCD X3(3), reset = RI X3(4)) X3(1), sck = DSR X3(2), mosi = DCD X3(3), reset = RI X3(4))
+ diecimila (alias for arduino-ft232r) + diecimila (alias for arduino-ft232r)
- pickit2
- Atmel JTAGICE3 - Atmel JTAGICE3
* Bugfixes * Bugfixes

View File

@ -45,23 +45,16 @@
#include "ac_cfg.h" #include "ac_cfg.h"
#if defined(HAVE_LIBUSB) || (defined(WIN32NATIVE) && defined(HAVE_LIBHID))
#include <math.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <errno.h>
#include <limits.h>
#include <unistd.h>
#include <sys/time.h>
#include <time.h>
#include <inttypes.h> #include <inttypes.h>
#include "avrdude.h" #include "avrdude.h"
#include "avr.h" #include "avr.h"
#include "pgm.h" #include "pgm.h"
#include "usbdevs.h"
#if defined(HAVE_LIBUSB) || (defined(WIN32NATIVE) && defined(HAVE_LIBHID))
#if (defined(WIN32NATIVE) && defined(HAVE_LIBHID)) #if (defined(WIN32NATIVE) && defined(HAVE_LIBHID))
#include <windows.h> #include <windows.h>