diff options
author | Douglas Gregor <dgregor@apple.com> | 2009-05-11 18:05:52 +0000 |
---|---|---|
committer | Douglas Gregor <dgregor@apple.com> | 2009-05-11 18:05:52 +0000 |
commit | 01746745f1287effa1772ef51b973988afcea699 (patch) | |
tree | a0b36215c048f45698f1ecbef044953e0f3e37cc /include/llvm | |
parent | 5c8274b5e3034c1cfae02426c68f353abfbf506f (diff) | |
download | external_llvm-01746745f1287effa1772ef51b973988afcea699.zip external_llvm-01746745f1287effa1772ef51b973988afcea699.tar.gz external_llvm-01746745f1287effa1772ef51b973988afcea699.tar.bz2 |
Add terminal width detection to llvm::sys::Process. This is needed to
fix Clang PRs 4148 and 4183.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@71448 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/llvm')
-rw-r--r-- | include/llvm/ADT/FoldingSet.h | 1 | ||||
-rw-r--r-- | include/llvm/Config/config.h.cmake | 5 | ||||
-rw-r--r-- | include/llvm/Config/config.h.in | 3 | ||||
-rw-r--r-- | include/llvm/System/Process.h | 13 |
4 files changed, 21 insertions, 1 deletions
diff --git a/include/llvm/ADT/FoldingSet.h b/include/llvm/ADT/FoldingSet.h index d03d64b..e31e112 100644 --- a/include/llvm/ADT/FoldingSet.h +++ b/include/llvm/ADT/FoldingSet.h @@ -19,6 +19,7 @@ #include "llvm/Support/DataTypes.h" #include "llvm/ADT/SmallVector.h" #include <string> +#include <iterator> namespace llvm { class APFloat; diff --git a/include/llvm/Config/config.h.cmake b/include/llvm/Config/config.h.cmake index dac1856..443afb1 100644 --- a/include/llvm/Config/config.h.cmake +++ b/include/llvm/Config/config.h.cmake @@ -164,7 +164,7 @@ #cmakedefine HAVE_INTTYPES_H ${HAVE_INTTYPES_H} /* Define to 1 if you have the `isatty' function. */ -#undef HAVE_ISATTY +#cmakedefine HAVE_ISATTY 1 /* Set to 1 if the isinf function is found in <cmath> */ #cmakedefine HAVE_ISINF_IN_CMATH ${HAVE_ISINF_IN_CMATH} @@ -388,6 +388,9 @@ /* Define to 1 if you have the <sys/dl.h> header file. */ #cmakedefine HAVE_SYS_DL_H ${HAVE_SYS_DL_H} +/* Define to 1 if you have the <sys/ioctl.h> header file. */ +#cmakedefine HAVE_SYS_IOCTL_H ${HAVE_SYS_IOCTL_H} + /* Define to 1 if you have the <sys/mman.h> header file. */ #cmakedefine HAVE_SYS_MMAN_H ${} diff --git a/include/llvm/Config/config.h.in b/include/llvm/Config/config.h.in index 805a07a..f0522e5 100644 --- a/include/llvm/Config/config.h.in +++ b/include/llvm/Config/config.h.in @@ -391,6 +391,9 @@ /* Define to 1 if you have the <sys/dl.h> header file. */ #undef HAVE_SYS_DL_H +/* Define to 1 if you have the <sys/ioctl.h> header file. */ +#undef HAVE_SYS_IOCTL_H + /* Define to 1 if you have the <sys/mman.h> header file. */ #undef HAVE_SYS_MMAN_H diff --git a/include/llvm/System/Process.h b/include/llvm/System/Process.h index f98a361..ce19eb2 100644 --- a/include/llvm/System/Process.h +++ b/include/llvm/System/Process.h @@ -94,6 +94,19 @@ namespace sys { /// the user rather than being put on a pipe or stored in a file. static bool StandardErrIsDisplayed(); + /// This function determines the number of columns in the window + /// if standard output is connected to a "tty" or "console" + /// window. If standard output is not connected to a tty or + /// console, or if the number of columns cannot be determined, + /// this routine returns zero. + static unsigned StandardOutColumns(); + + /// This function determines the number of columns in the window + /// if standard error is connected to a "tty" or "console" + /// window. If standard error is not connected to a tty or + /// console, or if the number of columns cannot be determined, + /// this routine returns zero. + static unsigned StandardErrColumns(); /// @} }; } |