diff --git a/lib/termios.c b/lib/termios.c index 7bcca24ba..1170241b3 100644 --- a/lib/termios.c +++ b/lib/termios.c @@ -1,4 +1,8 @@ -#ifdef WIN32 +#ifdef HAVE_CONFIG_H +#include +#endif + +#if defined(WIN32) && !defined(HAVE_TERMIOS_H) #ifdef TRENT_IS_HERE #define TRACE #define DEBUG diff --git a/lib/usleep.c b/lib/usleep.c index 01b8e7705..a74430a59 100644 --- a/lib/usleep.c +++ b/lib/usleep.c @@ -52,7 +52,7 @@ usleep (unsigned int useconds) /* 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 WIN32 +#elif defined(WIN32) && !defined(__CYGWIN__) Sleep( useconds/1000 ); return 0; #else diff --git a/src/event.c b/src/event.c index 6cc296c34..9112535eb 100644 --- a/src/event.c +++ b/src/event.c @@ -2,7 +2,7 @@ * Hamlib Interface - event handling * Copyright (c) 2000-2003 by Stephane Fillod and Frank Singleton * - * $Id: event.c,v 1.20 2003-08-17 22:39:07 fillods Exp $ + * $Id: event.c,v 1.21 2003-08-20 07:22:40 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 @@ -45,7 +45,7 @@ #include "event.h" -#if defined(WIN32) +#if defined(WIN32) && !defined(HAVE_TERMIOS_H) #include "win32termios.h" #endif diff --git a/src/iofunc.c b/src/iofunc.c index 34ba3291b..5f83ecf44 100644 --- a/src/iofunc.c +++ b/src/iofunc.c @@ -2,7 +2,7 @@ * Hamlib Interface - generic file based io functions * Copyright (c) 2000-2003 by Stephane Fillod and Frank Singleton * - * $Id: iofunc.c,v 1.8 2003-08-15 01:25:26 fillods Exp $ + * $Id: iofunc.c,v 1.9 2003-08-20 07:22:40 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 @@ -38,7 +38,7 @@ #include "iofunc.h" #include "misc.h" -#if defined(WIN32) +#if defined(WIN32) && !defined(HAVE_TERMIOS_H) #include "win32termios.h" #define read win32_serial_read #define write win32_serial_write diff --git a/src/serial.c b/src/serial.c index e654b3fd2..10ac63418 100644 --- a/src/serial.c +++ b/src/serial.c @@ -4,7 +4,7 @@ * Parts of the PTT handling are derived from soundmodem, an excellent * ham packet softmodem written by Thomas Sailer, HB9JNX. * - * $Id: serial.c,v 1.34 2003-08-17 22:39:07 fillods Exp $ + * $Id: serial.c,v 1.35 2003-08-20 07:22:40 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 @@ -66,7 +66,7 @@ #include #endif -#if defined(WIN32) +#if defined(WIN32) && !defined(HAVE_TERMIOS_H) #include "win32termios.h" #else #define OPEN open