avr
/
avrdude
mirror of https://github.com/mariusgreuel/avrdude.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make the private prototype for gettimeofday() only visible if the 

autoconfiguration figured out we need it.  The private implementation
has already been protected that way.

This should finally really fix bug #17884: another gettimeofday
conflict under win32/cygwin


git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@669 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
joerg_wunsch 2006-09-30 20:48:17 +00:00
parent 46d9258164
commit cbb96b1401
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pgm.h
View File

@ -110,6 +110,7 @@ PROGRAMMER * pgm_new(void);
#if defined(WIN32NATIVE) #if defined(WIN32NATIVE)
#include "ac_cfg.h"
#include <windows.h> #include <windows.h>
/* usleep replacements */ /* usleep replacements */
@ -121,7 +122,9 @@ PROGRAMMER * pgm_new(void);
*/ */
void usleep(unsigned long us); void usleep(unsigned long us);
#if !defined(HAVE_GETTIMEOFDAY)
int gettimeofday(struct timeval *tv, struct timezone *tz); int gettimeofday(struct timeval *tv, struct timezone *tz);
#endif /* HAVE_GETTIMEOFDAY */
#endif /* __win32native_h */ #endif /* __win32native_h */