mirror of
https://github.com/mariusgreuel/avrdude.git
synced 2025-09-27 22:45:27 +00:00
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:
3
pgm.h
3
pgm.h
@@ -110,6 +110,7 @@ PROGRAMMER * pgm_new(void);
|
||||
|
||||
#if defined(WIN32NATIVE)
|
||||
|
||||
#include "ac_cfg.h"
|
||||
#include <windows.h>
|
||||
|
||||
/* usleep replacements */
|
||||
@@ -121,7 +122,9 @@ PROGRAMMER * pgm_new(void);
|
||||
*/
|
||||
void usleep(unsigned long us);
|
||||
|
||||
#if !defined(HAVE_GETTIMEOFDAY)
|
||||
int gettimeofday(struct timeval *tv, struct timezone *tz);
|
||||
#endif /* HAVE_GETTIMEOFDAY */
|
||||
|
||||
#endif /* __win32native_h */
|
||||
|
||||
|
Reference in New Issue
Block a user