2007-07-06 Jeff Johnston <jjohnstn@redhat.com>

       * libc/include/sys/time.h (gettimeofday): Change to proper
       prototype where second parameter is void *.
       * libc/include/reent.h: Fix prototype for _gettimeofday_r.
       * libc/time/timer.c (_gettimeofday_r): Change prototype accordingly.

2007-06-13  Patrick Mansfield  <patmans@us.ibm.com>

       * libc/include/sys/unistd.h: Change usleep prototype to Posix.

2007-01-05  Brian Ford  <Brian.Ford@FlightSafety.com>

       * configure.host (*-*-cygwin*): Define HAVE_BLKSIZE.

6 files changed, 22 insertions, 7 deletions

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 1433fbe..7f3dfb9 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,18 @@
+2007-07-06  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* libc/include/sys/time.h (gettimeofday): Change to proper
+	prototype where second parameter is void *.
+	* libc/include/reent.h: Fix prototype for _gettimeofday_r.
+	* libc/time/timer.c (_gettimeofday_r): Change prototype accordingly.
+
+2007-06-13  Patrick Mansfield  <patmans@us.ibm.com>
+
+	* libc/include/sys/unistd.h: Change usleep prototype to Posix.
+
+2007-01-05  Brian Ford  <Brian.Ford@FlightSafety.com>
+
+	* configure.host (*-*-cygwin*): Define HAVE_BLKSIZE.
+
 2006-12-14  Jeff Johnston  <jjohnstn@redhat.com>
             Eric Blake  <ebb9@byu.net>
 
diff --git a/newlib/configure.host b/newlib/configure.host
index aaddc77..487a140 100644
--- a/newlib/configure.host
+++ b/newlib/configure.host
@@ -481,7 +481,7 @@ case "${host}" in
 	default_newlib_io_long_double="yes"
 	default_newlib_io_pos_args="yes"
 	CC="${CC} -I${cygwin_srcdir}/include"
-	newlib_cflags="${newlib_cflags} -DHAVE_OPENDIR -DHAVE_RENAME -DSIGNAL_PROVIDED -D_COMPILING_NEWLIB -DHAVE_FCNTL -DMALLOC_PROVIDED"
+	newlib_cflags="${newlib_cflags} -DHAVE_OPENDIR -DHAVE_RENAME -DSIGNAL_PROVIDED -D_COMPILING_NEWLIB -DHAVE_BLKSIZE -DHAVE_FCNTL -DMALLOC_PROVIDED"
 	syscall_dir=syscalls
 	;;
 # RTEMS supplies its own versions of some routines:
diff --git a/newlib/libc/include/reent.h b/newlib/libc/include/reent.h
index 00c2eb4..639789e 100644
--- a/newlib/libc/include/reent.h
+++ b/newlib/libc/include/reent.h
@@ -80,7 +80,7 @@ extern int _wait_r _PARAMS ((struct _reent *, int *));
 extern _ssize_t _write_r _PARAMS ((struct _reent *, int, const void *, size_t));
 
 /* This one is not guaranteed to be available on all targets.  */
-extern int _gettimeofday_r _PARAMS ((struct _reent *, struct timeval *tp, struct timezone *tzp));
+extern int _gettimeofday_r _PARAMS ((struct _reent *, struct timeval *__tp, void *__tzp));
 
 #ifdef __LARGE64_FILES
 
diff --git a/newlib/libc/include/sys/time.h b/newlib/libc/include/sys/time.h
index df31649..9881d33 100644
--- a/newlib/libc/include/sys/time.h
+++ b/newlib/libc/include/sys/time.h
@@ -70,7 +70,7 @@ struct  itimerval {
   } while (0)
 #endif /* defined (__rtems__) || defined (__CYGWIN__) */
 
-int _EXFUN(gettimeofday, (struct timeval *__p, struct timezone *__z));
+int _EXFUN(gettimeofday, (struct timeval *__p, void *__z));
 int _EXFUN(settimeofday, (const struct timeval *, const struct timezone *));
 int _EXFUN(utimes, (const char *__path, const struct timeval *__tvp));
 int _EXFUN(getitimer, (int __which, struct itimerval *__value));
diff --git a/newlib/libc/include/sys/unistd.h b/newlib/libc/include/sys/unistd.h
index a670dd7..dd30999 100644
--- a/newlib/libc/include/sys/unistd.h
+++ b/newlib/libc/include/sys/unistd.h
@@ -200,7 +200,7 @@ int     _EXFUN(truncate, (const char *, off_t __length));
 int	_EXFUN(getdtablesize, (void));
 int	_EXFUN(setdtablesize, (int));
 useconds_t _EXFUN(ualarm, (useconds_t __useconds, useconds_t __interval));
-unsigned _EXFUN(usleep, (unsigned int __useconds));
+int	_EXFUN(usleep, (useconds_t __useconds));
 #if !(defined  (_WINSOCK_H) || defined (__USE_W32_SOCKETS))
 /* winsock[2].h defines as __stdcall, and with int as 2nd arg */
  int	_EXFUN(gethostname, (char *__name, size_t __len));
diff --git a/newlib/libc/reent/timer.c b/newlib/libc/reent/timer.c
index b604b90..6aa4e02 100644
--- a/newlib/libc/reent/timer.c
+++ b/newlib/libc/reent/timer.c
@@ -77,7 +77,7 @@ ANSI_SYNOPSIS
 	#include <time.h>
 	int _gettimeofday_r(struct _reent *<[ptr]>,
 		struct timeval *<[ptimeval]>,
-		struct timezone *<[ptimezone]>);
+		void *<[ptimezone]>);
 
 TRAD_SYNOPSIS
 	#include <reent.h>
@@ -85,7 +85,7 @@ TRAD_SYNOPSIS
 	int _gettimeofday_r(<[ptr]>, <[ptimeval]>, <[ptimezone]>)
 	struct _reent *<[ptr]>;
 	struct timeval *<[ptimeval]>;
-	struct timezone *<[ptimezone]>;
+	void *<[ptimezone]>;
 
 DESCRIPTION
 	This is a reentrant version of <<gettimeofday>>.  It
@@ -100,7 +100,7 @@ int
 _DEFUN (_gettimeofday_r, (ptr, ptimeval, ptimezone),
      struct _reent *ptr _AND
      struct timeval *ptimeval _AND
-     struct timezone *ptimezone)
+     void *ptimezone)
 {
   int ret;