* bitbang.c: Fix Win32 build error: move freq up to the file

level.
* buspirate.c: Fix Win32 build warning: include <malloc.h> to
to get a declaration for alloca().




git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@898 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
joerg_wunsch 2010-01-08 20:02:35 +00:00
parent 6a17d2ca34
commit d10c930a25
3 changed files with 11 additions and 2 deletions

View File

@ -1,3 +1,10 @@
2010-01-08 Joerg Wunsch <j.gnu@uriah.heep.sax.de>
* bitbang.c: Fix Win32 build error: move freq up to the file
level.
* buspirate.c: Fix Win32 build warning: include <malloc.h> to
to get a declaration for alloca().
2010-01-08 Thomas Fischl <tfischl@gmx.de> 2010-01-08 Thomas Fischl <tfischl@gmx.de>
bug #28520: Programming with USBasp with low clock speed fails bug #28520: Programming with USBasp with low clock speed fails

View File

@ -44,6 +44,7 @@ static int delay_decrement;
#if defined(WIN32NATIVE) #if defined(WIN32NATIVE)
static int has_perfcount; static int has_perfcount;
static LARGE_INTEGER freq;
#else #else
static volatile int done; static volatile int done;
@ -63,8 +64,6 @@ static void alarmhandler(int signo)
static void bitbang_calibrate_delay(void) static void bitbang_calibrate_delay(void)
{ {
#if defined(WIN32NATIVE) #if defined(WIN32NATIVE)
static LARGE_INTEGER freq;
/* /*
* If the hardware supports a high-resolution performance counter, * If the hardware supports a high-resolution performance counter,
* we ultimately prefer that one, as it gives quite accurate delays * we ultimately prefer that one, as it gives quite accurate delays

View File

@ -41,6 +41,9 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#if defined(WIN32NATIVE)
# include <malloc.h> /* for alloca() */
#endif
#include "avrdude.h" #include "avrdude.h"
#include "avr.h" #include "avr.h"