X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fcurses.priv.h;h=4b5fe2f31a8d4b3013572bcd1e064538ef2a2530;hp=6d3a861bb2e8499a87d7598100060fb5684e1f97;hb=7d3e03f12f3e179f5780f733fa5b78d981080d48;hpb=ef2d99350e0d3e4606171b5b1466ab92ec440205 diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h index 6d3a861b..4b5fe2f3 100644 --- a/ncurses/curses.priv.h +++ b/ncurses/curses.priv.h @@ -34,7 +34,7 @@ ****************************************************************************/ /* - * $Id: curses.priv.h,v 1.531 2014/03/08 19:58:54 tom Exp $ + * $Id: curses.priv.h,v 1.535 2014/04/26 18:45:36 juergen Exp $ * * curses.priv.h * @@ -179,6 +179,18 @@ extern int errno; #define USE_SIGWINCH 0 #endif +/* + * When building in the MSYS2 environment, the automatic discovery of + * the path separator in configure doesn't work properly. So, if building + * for MinGW, we enforce the correct Windows PATH separator + */ +#ifdef __MINGW32__ +# ifdef NCURSES_PATHSEP +# undef NCURSES_PATHSEP +# endif +# define NCURSES_PATHSEP ';' +#endif + /* * If desired, one can configure this, disabling environment variables that * point to custom terminfo/termcap locations. @@ -2226,6 +2238,7 @@ typedef struct _termInfo typedef struct term_driver { bool isTerminfo; + const char* (*td_name)(struct DriverTCB*); bool (*td_CanHandle)(struct DriverTCB*, const char*, int*); void (*td_init)(struct DriverTCB*); void (*td_release)(struct DriverTCB*); @@ -2337,6 +2350,8 @@ extern NCURSES_EXPORT(void) _nc_get_screensize(SCREEN *, int *, int *); #ifdef __MINGW32__ #include extern NCURSES_EXPORT_VAR(TERM_DRIVER) _nc_WIN_DRIVER; +extern NCURSES_EXPORT(int) _nc_mingw_isatty(int fd); +extern NCURSES_EXPORT(int) _nc_mingw_isconsole(int fd); #endif extern NCURSES_EXPORT_VAR(TERM_DRIVER) _nc_TINFO_DRIVER; #endif @@ -2448,6 +2463,12 @@ extern NCURSES_EXPORT(NCURSES_CONST char *) _nc_unctrl (SCREEN *, chtype); #endif +#ifndef __MINGW32__ +# define NC_ISATTY(fd) isatty(fd) +#else +# define NC_ISATTY(fd) _nc_mingw_isatty(fd) +#endif + #ifdef __cplusplus } #endif