X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=include%2Fnc_termios.h;h=13cc0af7ab531431377d567045916f8e630b703f;hp=5efab40e8a4a030957790c561c67dea52604a96e;hb=f67a188e71a0e6f80c1c45e50e7a7449c2d7bfb3;hpb=71244b7927a8918c0b09a8eb13b017ef0ebb6de8 diff --git a/include/nc_termios.h b/include/nc_termios.h index 5efab40e..13cc0af7 100644 --- a/include/nc_termios.h +++ b/include/nc_termios.h @@ -1,5 +1,6 @@ /**************************************************************************** - * Copyright (c) 2011-2014,2017 Free Software Foundation, Inc. * + * Copyright 2018,2020 Thomas E. Dickey * + * Copyright 2011-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -30,7 +31,7 @@ * Author: Thomas E. Dickey 2011 * ****************************************************************************/ -/* $Id: nc_termios.h,v 1.5 2017/07/23 00:02:08 tom Exp $ */ +/* $Id: nc_termios.h,v 1.8 2020/08/29 20:53:19 tom Exp $ */ #ifndef NC_TERMIOS_included #define NC_TERMIOS_included 1 @@ -69,9 +70,13 @@ #define tcflush(fd, arg) ioctl(fd, TCFLSH, arg) #endif +#if defined(EXP_WIN32_DRIVER) +#undef TERMIOS +#endif + #else /* !HAVE_TERMIO_H */ -#if __MINGW32__ +#if defined(_WIN32) && !defined(EXP_WIN32_DRIVER) /* lflag bits */ #define ISIG 0x0001 @@ -155,7 +160,7 @@ #undef ttyname #define ttyname(fd) NULL -#endif /* __MINGW32__ */ +#endif /* _WIN32 */ #endif /* HAVE_TERMIO_H */ #endif /* HAVE_TERMIOS_H */