gr_pwin32.m4/config.h fixes

git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@1602 7ae35d74-ebe9-4afe-98af-79ac388436b8

lib/gettimeofday.c

@@ -8,13 +8,8 @@
 # include <winbase.h>
 #endif
 
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
-
-#ifndef timezone
-struct timezone {
-	int  tz_minuteswest;
-	int  tz_dsttime;
-};
 #endif
 
 /* 

lib/usleep.c

@@ -45,24 +45,23 @@ Cambridge, MA 02139, USA.  */
 #endif
 
 /* Sleep USECONDS microseconds, or until a previously set timer goes off.  */
-unsigned int
-usleep (unsigned int useconds)
+int
+usleep (unsigned long useconds)
 {
 #ifdef apollo
   /* The usleep function does not work under the SYS5.3 environment.
      Use the Domain/OS time_$wait call instead. */
   time_$wait (time_$relative, DomainTime100mS, &DomainStatus);
-#elif defined(WIN32) && !defined(__CYGWIN__)
+#elif defined(HAVE_SSLEEP)	/* Win32 */
   Sleep( useconds/1000 );
-  return 0;
 #else
   struct timeval delay;
 
   delay.tv_sec = 0;
   delay.tv_usec = useconds;
   select (0, 0, 0, 0, &delay);
-  return 0;
 #endif
+  return 0;
 }
 
 #endif /* !HAVE_USLEEP */

lib/win32termios.h

@@ -135,7 +135,7 @@ int win32_serial_select(int, struct fd_set *, struct fd_set *, struct fd_set *,
 void termios_interrupt_event_loop( int , int );
 void termios_setflags( int , int[] );
 struct termios_list *find_port( int );
-void usleep(unsigned long usec);
+int usleep(unsigned long usec);
 int fcntl(int fd, int command, ...);
 const char *get_dos_port(const char *);
 void set_errno(int);

src/register.h

@@ -2,7 +2,7 @@
  *  Hamlib Interface - plugin registration
  *  Copyright (c) 2003 by Stephane Fillod
  *
- *	$Id: register.h,v 1.2 2003-09-23 22:52:52 fillods Exp $
+ *	$Id: register.h,v 1.3 2003-11-16 22:15:37 fillods Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -22,9 +22,6 @@
 #ifndef _REGISTER_H
 #define _REGISTER_H 1
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
 
 #include <hamlib/rig.h>
 #include <hamlib/rotator.h>

src/tones.h

@@ -2,7 +2,7 @@
  *  Hamlib Interface - CTCSS and DCS tables header
  *  Copyright (c) 2000-2003 by Stephane Fillod and Frank Singleton
  *
- *	$Id: tones.h,v 1.4 2003-04-23 20:13:04 fillods Exp $
+ *	$Id: tones.h,v 1.5 2003-11-16 22:15:38 fillods Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -23,9 +23,6 @@
 #ifndef _TONES_H
 #define _TONES_H 1
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
 
 #include "hamlib/rig.h"		/* and implicitly rig_dll.h */