* configure.ac: Check for gettimeofday().
* ppiwin.c (gettimeofday): Define gettimeofday() replacement only if !defined(HAVE_GETTIMEOFDAY); use correct protype. git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@616 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
parent
bfb042c7bc
commit
b4b3e1d5b8
|
@ -1,3 +1,9 @@
|
||||||
|
2006-08-20 Joerg Wunsch <j@uriah.heep.sax.de>
|
||||||
|
|
||||||
|
* configure.ac: Check for gettimeofday().
|
||||||
|
* ppiwin.c (gettimeofday): Define gettimeofday() replacement
|
||||||
|
only if !defined(HAVE_GETTIMEOFDAY); use correct protype.
|
||||||
|
|
||||||
2006-08-18 Joerg Wunsch <j@uriah.heep.sax.de>
|
2006-08-18 Joerg Wunsch <j@uriah.heep.sax.de>
|
||||||
|
|
||||||
* stk500v2: Minor cosmetic changes: STK500 firmware version
|
* stk500v2: Minor cosmetic changes: STK500 firmware version
|
||||||
|
|
|
@ -65,7 +65,7 @@ AC_HEADER_TIME
|
||||||
# Checks for library functions.
|
# Checks for library functions.
|
||||||
AC_PROG_GCC_TRADITIONAL
|
AC_PROG_GCC_TRADITIONAL
|
||||||
AC_FUNC_MALLOC
|
AC_FUNC_MALLOC
|
||||||
AC_CHECK_FUNCS([memset select strcasecmp strdup strerror strncasecmp strtol strtoul])
|
AC_CHECK_FUNCS([memset select strcasecmp strdup strerror strncasecmp strtol strtoul gettimeofday])
|
||||||
|
|
||||||
# Checks for misc stuff.
|
# Checks for misc stuff.
|
||||||
|
|
||||||
|
|
11
ppiwin.c
11
ppiwin.c
|
@ -1,6 +1,7 @@
|
||||||
/*
|
/*
|
||||||
* avrdude - A Downloader/Uploader for AVR device programmers
|
* avrdude - A Downloader/Uploader for AVR device programmers
|
||||||
* Copyright (C) 2003, 2004 Eric B. Weddington <ericw@evcohs.com>
|
* Copyright (C) 2003, 2004, 2006
|
||||||
|
* Eric B. Weddington <eweddington@cso.atmel.com>
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* This program is free software; you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -29,7 +30,7 @@ reg = register as defined in an enum in ppi.h. This must be converted
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
#include "ac_cfg.h"
|
||||||
|
|
||||||
#if defined (WIN32NATIVE)
|
#if defined (WIN32NATIVE)
|
||||||
|
|
||||||
|
@ -316,7 +317,8 @@ static void outb(unsigned char value, unsigned short port)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
void gettimeofday(struct timeval*tv, void*z){
|
#if !defined(HAVE_GETTIMEOFDAY)
|
||||||
|
int gettimeofday(struct timeval *tv, struct timezone *unused){
|
||||||
// i've found only ms resolution, avrdude expects us
|
// i've found only ms resolution, avrdude expects us
|
||||||
|
|
||||||
SYSTEMTIME st;
|
SYSTEMTIME st;
|
||||||
|
@ -324,7 +326,10 @@ void gettimeofday(struct timeval*tv, void*z){
|
||||||
|
|
||||||
tv->tv_sec=(long)(st.wSecond+st.wMinute*60+st.wHour*3600);
|
tv->tv_sec=(long)(st.wSecond+st.wMinute*60+st.wHour*3600);
|
||||||
tv->tv_usec=(long)(st.wMilliseconds*1000);
|
tv->tv_usec=(long)(st.wMilliseconds*1000);
|
||||||
|
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
#endif /* HAVE_GETTIMEOFDAY */
|
||||||
|
|
||||||
// #define W32USLEEPDBG
|
// #define W32USLEEPDBG
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue