diff options
| author | Evan Mallory <schmave@gmail.com> | 2016-09-17 13:29:09 -0400 |
|---|---|---|
| committer | Evan Mallory <schmave@gmail.com> | 2016-09-17 14:22:38 -0400 |
| commit | c193cc3a5b4dbf39e19744cf4d30e616298eaa86 (patch) | |
| tree | 5f837949c367f435d947833c6f52e37473357ee6 /src/select.cc | |
| parent | a3b573e1107729e743c96da8ed9272361ba6ae31 (diff) | |
| download | fork-ledger-c193cc3a5b4dbf39e19744cf4d30e616298eaa86.tar.gz fork-ledger-c193cc3a5b4dbf39e19744cf4d30e616298eaa86.tar.bz2 fork-ledger-c193cc3a5b4dbf39e19744cf4d30e616298eaa86.zip | |
Fix build under msys32; add Appveyor continuous build
* Appveyor is a continuous integration platform for Windows that is free for open source projects. See latest test build here: https://ci.appveyor.com/project/Evan/ledger/build/artifacts
* Changed WIN32 to _WIN32 because this article http://nadeausoftware.com/articles/2012/01/c_c_tip_how_use_compiler_predefined_macros_detect_operating_system claims that it is defined by the greatest number of compilers.
* Modified HAVE_ISATTY and other system defines so that system.hh compiles when cmake fails to find the relevant function.
* Add missing include in test/unit/t_value.cc
Almost all tests fail when you run them on msys32. I will address that in a future PR.
Diffstat (limited to 'src/select.cc')
| -rw-r--r-- | src/select.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/select.cc b/src/select.cc index 1c69b2bf..8e7786e6 100644 --- a/src/select.cc +++ b/src/select.cc @@ -145,14 +145,14 @@ value_t select_command(call_scope_t& args) string thus_far = ""; std::size_t cols = 0; -#if HAVE_IOCTL +#ifdef HAVE_IOCTL struct winsize ws; #endif if (report.HANDLED(columns_)) cols = lexical_cast<std::size_t>(report.HANDLER(columns_).value); else if (const char * columns_env = std::getenv("COLUMNS")) cols = lexical_cast<std::size_t>(columns_env); -#if HAVE_IOCTL +#ifdef HAVE_IOCTL else if (ioctl(STDIN_FILENO, TIOCGWINSZ, &ws) != -1) cols = ws.ws_col; #endif |