Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Work around missing TABX defines #263

Merged
merged 2 commits into from
Feb 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions .cirrus.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,25 @@
freebsd_instance:
image_family: freebsd-13-1

task:
name: FreeBSD
freebsd_instance:
image_family: freebsd-13-1
install_script: pkg install -y ghc hs-cabal-install git autoconf
script:
- cabal update
- autoreconf -i
- cabal test --test-show-details=direct

task:
name: OpenBSD
compute_engine_instance:
image_project: pg-ci-images
image: family/pg-ci-openbsd-vanilla-7-2
platform: openbsd
install_script: pkg_add ghc cabal-install git autoconf-2.71
script:
- export AUTOCONF_VERSION=2.71
- export CABAL_DIR=/tmp/.cabal
- ghc --version
- cabal --version
- cabal update
- autoreconf -i
- cabal test --test-show-details=direct
17 changes: 16 additions & 1 deletion System/Posix/Terminal/Common.hsc
Original file line number Diff line number Diff line change
Expand Up @@ -216,13 +216,16 @@ data TerminalMode
| ReturnMeansLF -- ^ @ONLRET@ - (XSI) NL performs CR function
--
-- @since 2.8.0.0
#ifdef TAB0
| TabDelayMask0 -- ^ @TABDLY(TAB0)@ - (XSI) Select horizontal-tab delays: type 0
--
-- @since 2.8.0.0
#endif
#ifdef TAB3
| TabDelayMask3 -- ^ @TABDLY(TAB3)@ - (XSI) Select horizontal-tab delays: type 3
--
-- @since 2.8.0.0

#endif
-- control flags
| LocalMode -- ^ @CLOCAL@ - Ignore modem status lines
| ReadEnable -- ^ @CREAD@ - Enable receiver
Expand Down Expand Up @@ -289,8 +292,12 @@ withoutMode termios MapLFtoCRLF = clearOutputFlag (#const ONLCR) termios
withoutMode termios OutputMapCRtoLF = clearOutputFlag (#const OCRNL) termios
withoutMode termios NoCRAtColumnZero = clearOutputFlag (#const ONOCR) termios
withoutMode termios ReturnMeansLF = clearOutputFlag (#const ONLRET) termios
#ifdef TAB0
withoutMode termios TabDelayMask0 = clearOutputFlag (#const TAB0) termios
#endif
#ifdef TAB3
withoutMode termios TabDelayMask3 = clearOutputFlag (#const TAB3) termios
#endif
withoutMode termios LocalMode = clearControlFlag (#const CLOCAL) termios
withoutMode termios ReadEnable = clearControlFlag (#const CREAD) termios
withoutMode termios TwoStopBits = clearControlFlag (#const CSTOPB) termios
Expand Down Expand Up @@ -325,8 +332,12 @@ withMode termios MapLFtoCRLF = setOutputFlag (#const ONLCR) termios
withMode termios OutputMapCRtoLF = setOutputFlag (#const OCRNL) termios
withMode termios NoCRAtColumnZero = setOutputFlag (#const ONOCR) termios
withMode termios ReturnMeansLF = setOutputFlag (#const ONLRET) termios
#ifdef TAB0
withMode termios TabDelayMask0 = setOutputFlag (#const TAB0) termios
#endif
#ifdef TAB3
withMode termios TabDelayMask3 = setOutputFlag (#const TAB3) termios
#endif
withMode termios LocalMode = setControlFlag (#const CLOCAL) termios
withMode termios ReadEnable = setControlFlag (#const CREAD) termios
withMode termios TwoStopBits = setControlFlag (#const CSTOPB) termios
Expand Down Expand Up @@ -361,8 +372,12 @@ terminalMode MapLFtoCRLF = testOutputFlag (#const ONLCR)
terminalMode OutputMapCRtoLF = testOutputFlag (#const OCRNL)
terminalMode NoCRAtColumnZero = testOutputFlag (#const ONOCR)
terminalMode ReturnMeansLF = testOutputFlag (#const ONLRET)
#ifdef TAB0
terminalMode TabDelayMask0 = testOutputFlag (#const TAB0)
#endif
#ifdef TAB3
terminalMode TabDelayMask3 = testOutputFlag (#const TAB3)
#endif
terminalMode LocalMode = testControlFlag (#const CLOCAL)
terminalMode ReadEnable = testControlFlag (#const CREAD)
terminalMode TwoStopBits = testControlFlag (#const CSTOPB)
Expand Down