COMP: TIOCGWINSZ and struct winsize also doesn't exist on Cray Catamount
Alex
This commit is contained in:
parent
6b45ec0326
commit
f2bb57684f
|
@ -66,10 +66,13 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// getpwnam doesn't exist on Windows and Cray Xt3/Catamount
|
// getpwnam doesn't exist on Windows and Cray Xt3/Catamount
|
||||||
|
// same for TIOCGWINSZ
|
||||||
#if defined(_WIN32) || defined (__LIBCATAMOUNT__)
|
#if defined(_WIN32) || defined (__LIBCATAMOUNT__)
|
||||||
# undef HAVE_GETPWNAM
|
# undef HAVE_GETPWNAM
|
||||||
|
# undef HAVE_TTY_INFO
|
||||||
#else
|
#else
|
||||||
# define HAVE_GETPWNAM 1
|
# define HAVE_GETPWNAM 1
|
||||||
|
# define HAVE_TTY_INFO 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
@ -3664,7 +3667,7 @@ bool SystemTools::GetLineFromStream(kwsys_ios::istream& is,
|
||||||
int SystemTools::GetTerminalWidth()
|
int SystemTools::GetTerminalWidth()
|
||||||
{
|
{
|
||||||
int width = -1;
|
int width = -1;
|
||||||
#ifndef _WIN32
|
#ifdef HAVE_TTY_INFO
|
||||||
struct winsize ws;
|
struct winsize ws;
|
||||||
char *columns; /* Unix98 environment variable */
|
char *columns; /* Unix98 environment variable */
|
||||||
if(ioctl(1, TIOCGWINSZ, &ws) != -1 && ws.ws_col>0 && ws.ws_row>0)
|
if(ioctl(1, TIOCGWINSZ, &ws) != -1 && ws.ws_col>0 && ws.ws_row>0)
|
||||||
|
|
Loading…
Reference in New Issue