+ avoid a blank line in output from tabs program by ending it with
a carriage return as done in FreeBSD (patch by James Clarke).
+ build-fix for the "--enable-ext-putwin" feature when not using
wide characters (report by Werner Fink).
+ modify autoconf macros to use scripting improvement from xterm.
+ add -brtl option to compiler options on AIX 5-7, needed to link
with the shared libraries.
+ add --with-extra-suffix option to help with installing nonconflicting
ncurses6 packages, e.g., avoiding header- and library-conflicts.
NOTE: as a side-effect, this renames
adacurses-config to adacurses5-config and
adacursesw-config to adacursesw5-config
+ modify debian/rules test package to suffix programs with "6".
+ clarify in curs_inopts.3x that window-specific settings do not
inherit into new windows.
+ add "-f" option to test/savescreen.c to help with testing/debugging
the extended putwin/getwin.
+ add logic for writing/reading combining characters in the extended
putwin/getwin.
+ add "--enable-ext-putwin" configure option to turn on the extended
putwin/getwin.
+ capture define's related to -D_XOPEN_SOURCE from the configure check
and add those to the *-config and *.pc files, to simplify use for
the wide-character libraries.
+ modify ncurses.spec to accommodate Fedora21's location of pkg-config
directory.
+ correct sense of "--disable-lib-suffixes" configure option (report
by Nicolas Boos, cf: 20140426).
+ add configure check to determine if "local: _*;" can be used in the
".map" files to selectively omit symbols beginning with "_". On at
least recent FreeBSD, the wildcard applies to all "_" symbols.
+ remove obsolete/conflicting rule for ncurses.map from
ncurses/Makefile.in (cf: 20130706).
+ modify_nc_flush() to retry if interrupted (patch by Stian Skjelstad).
+ change map files to make _nc_freeall a global, since it may be used
via the Ada95 binding when checking for memory leaks.
+ improve sed script used in 20141220 to account for wide-, threaded-
variations in ABI 6.
+ updated Ada95/configure with macro changes from 20141213
+ tie configure options --with-abi-version and --with-versioned-syms
together, so that ABI 6 libraries have distinct symbol versions from
the ABI 5 libraries.
+ replace obsolete/nonworking link to man2html with current one,
regenerate html-manpages.
+ modify misc/gen-pkgconfig.in to add -I option for include-directory
when using both --prefix and --disable-overwrite (report by Misty
De Meo).
+ add configure option --with-pc-suffix to allow minor renaming of
".pc" files and the corresponding library. Use this in the test
package for ncurses6.
+ modify configure script so that if pkg-config is not installed, it
is still possible to install ".pc" files (report by Misty De Meo).
+ updated ".sym" files, removing symbols which are marked as "local"
in the corresponding ".map" files.
+ updated ".map" files to reflect move of comp_captab and comp_hash
from tic-library to tinfo-library in 20090711 (report by Sven
Joachim).
+ improve description of limits for color values and color pairs in
curs_color.3x (prompted by patch by Tim van der Molen).
+ add VERSION file, using first field in that to record the ABI version
used for configure --with-libtool --disable-libtool-version
+ add configure options for applying the ".map" and ".sym" files to
the ncurses, form, menu and panel libraries.
+ add ".map" and ".sym" files to show exported symbols, e.g., for
symbol-versioning.
+ implement curs_set in win_driver.c
+ implement flash in win_driver.c
+ fix an infinite loop in win_driver.c if the command-window loses
focus.
+ improve the non-buffered mode, i.e., NCURSES_CONSOLE2, of
win_driver.c by temporarily changing the buffer-size to match the
window-size to eliminate the scrollback. Also enforce a minimum
screen-size of 24x80 in the non-buffered mode.
+ modify generated misc/Makefile to suppress install.data from the
dependencies if the --disable-db-install option is used, compensating
for the top-level makefile changes used to add ncurses*-config in the
20140920 changes (report by Steven Honeyman).
+ add ncurses*-config to bin-directory of sample package-scripts.
+ add check to ensure that getopt is available; this is a problem in
some older cross-compiler environments.
+ expanded on the description of --disable-overwrite in INSTALL
(prompted by reports by Joakim Tjernlund, Thomas Klausner).
See Gentoo #522586 and NetBSD #49200 for examples.
which relates to the clarified guidelines.
+ remove special logic from CF_INCLUDE_DIRS which adds the directory
for the --includedir from the build (report by Joakim Tjernlund).
+ add case for Unixware to CF_XOPEN_SOURCE, from lynx changes.
+ update config.sub from
http://git.savannah.gnu.org/cgit/config.git
+ minor portability fixes for MinGW:
+ ensure WINVER is defined in makefiles rather than using headers
+ add check for gnatprep "-T" option
+ work around bug introduced by gcc 4.8.1 in MinGW which breaks
"trace" feature:
http://stackoverflow.com/questions/20877689/gcc-4-8-1-minggw-d-option-does-not-work-as-usual
+ fix most compiler warnings for Cygwin ncurses-examples.
+ restore "redundant" -I options in test/Makefile.in, since they are
typically needed when building the derived ncurses-examples package
(cf: 20140726).
+ separate masking for sgr in vidputs from sitm/ritm, which do not
overlap with sgr functionality.
+ remove unneeded -i option from adacurses-config; put -a in the -I
option for consistency (patch by Pascal Pignard).
+ update xterm-new to patch #305 -TD
+ change format of test-scripts for Debian Ada95 and ncurses-examples
packages to quilted to work around Debian #700177 (cf: 20130907).
+ build fix for form_driver_w.c as part of ncurses-examples package for
older ncurses than 20131207.
+ add Hello World example to adacurses-config manpage.
+ remove unused --enable-pc-files option from Ada95/configure.
+ add --disable-gnat-projects option for testing.
+ revert changes to Ada95 project-files configuration (cf: 20140524).
+ corrected usage message in adacurses-config.
+ fix typo in ncurses manpage for the NCURSES_NO_MAGIC_COOKIE
environment variable.
+ improve discussion of input-echoing in curs_getch.3x
+ clarify discussion in curs_addch.3x of wrapping.
+ modify parametrized.h to make fln non-padded.
+ correct several entries which had termcap-style padding used in
terminfo: adm21, aj510, alto-h19, att605-pc, x820 -TD
+ correct syntax for padding in some entries: dg211, h19 -TD
+ correct ti924-8 which had confused padding versus octal escapes -TD
+ correct padding in sbi entry -TD
+ fix an old bug in the termcap emulation; "%i" was ignored in tparm()
because the parameters to be incremented were already on the internal
stack (report by Corinna Vinschen).
+ modify tic's "-c" option to take into account the "-C" option to
activate additional checks which compare the results from running
tparm() on the terminfo expressions versus the translated termcap
expressions.
+ modify tic to allow it to read from FIFOs (report by Matthieu Fronton,
cf: 20120324).
> patches by Nicolas Boulenguez:
+ explicit dereferences to suppress some style warnings.
+ when c_varargs_to_ada.c includes its header, use double quotes
instead of <>.
+ samples/ncurses2-util.adb: removed unused with clause. The warning
was removed by an obsolete pragma.
+ replaced Unreferenced pragmas with Warnings (Off). The latter,
available with older GNATs, needs no configure test. This also
replaces 3 untested Unreferenced pragmas.
+ simplified To_C usage in trace handling. Using two parameters allows
some basic formatting, and avoids a warning about security with some
compiler flags.
+ for generated Ada sources, replace many snippets with one pure
package.
+ removed C_Chtype and its conversions.
+ removed C_AttrType and its conversions.
+ removed conversions between int, Item_Option_Set, Menu_Option_Set.
+ removed int, Field_Option_Set, Item_Option_Set conversions.
+ removed C_TraceType, Attribute_Option_Set conversions.
+ replaced C.int with direct use of Eti_Error, now enumerated. As it
was used in a case statement, values were tested by the Ada compiler
to be consecutive anyway.
+ src/Makefile.in: remove duplicate stanza
+ only consider using a project for shared libraries.
+ style. Silent gnat-4.9 warning about misplaced "then".
+ generate shared library project to honor ADAFLAGS, LDFLAGS.
+ add --disable-lib-suffixes option (adapted from patch by Juergen
Pfeifer).
+ merge some changes from Juergen Pfeifer's work with MSYS2, to
simplify later merging:
+ use NC_ISATTY() macro for isatty() in library
+ add _nc_mingw_isatty() and related functions to windows-driver
+ rename terminal driver entrypoints to simplify grep's
+ remove a check in the sp-funcs flavor of newterm() which allowed only
the first call to newterm() to succeed (report by Thomas Beierlein,
cf: 20090927).
+ use types from <stdint.h> in sample build-scripts for chtype, etc.
+ modify configure script and curses.h.in to allow the types specified
using --with-chtype and related options to be defined in <stdint.h>
+ add terminology entry -TD
+ add mlterm3 entry, use that as "mlterm" -TD
+ inherit mlterm-256color from mlterm -TD
+ modify configure-script/ifdef's to allow OLD_TTY feature to be
suppressed if the type of ospeed is configured using the option
--with-ospeed to not be a short. By default, it is a short for
termcap-compatibility (adapted from suggestion by Christian
Weisgerber).
+ correct a typo in _nc_baudrate() (patch by Christian Weisgerber,
cf: 20061230).
+ fix a few -Wlogical-op warnings.
+ updated llib-l* files.
+ add special case to configure script to move _XOPEN_SOURCE_EXTENDED
definition from CPPFLAGS to CFLAGS if it happens to be needed for
Solaris, because g++ errors with that definition (report by
Jean-Pierre Flori, Sage #15268).
+ correct logic in infocmp's -i option which was intended to ignore
strings which correspond to function-keys as candidates for piecing
together initialization- or reset-strings. The problem dates to
1.9.7a, but was overlooked until changes in -Wlogical-op warnings for
gcc 4.8 (report by David Binderman).
+ updated CF_GCC_WARNINGS to documented options for gcc 4.9.0, adding
checks for -Wextra, -Wignored-qualifiers and -Wlogical-op
+ updated CF_GCC_WARNINGS to documented options for gcc 4.9.0, moving
checks for -Wextra and -Wdeclaration-after-statement into the macro,
and adding checks for -Wignored-qualifiers, -Wlogical-op and
-Wvarargs
+ updated CF_CURSES_UNCTRL_H and CF_SHARED_OPTS macros from ongoing
work on cdk.
+ update config.sub from
http://git.savannah.gnu.org/cgit/config.git
+ build-fixes for MSYS for two test-programs (patches by Ray Donnelly,
Alexey Pavlov).
+ revert change to two of the dpkg format files, to work with dpkg
before/after Debian #700177.
+ fix gcc -Wconversion warning in wattr_get() macro.
+ add msys and msysdll to known host/configuration types (patch by
Alexey Pavlov).
+ modify CF_RPATH_HACK configure macro to not rely upon "-u" option
of sort, improving portability.
+ minor improvements for test-programs from reviewing Solaris port.
+ update config.guess, config.sub from
http://git.savannah.gnu.org/cgit/config.git
+ minor fixes to the --disable-overwrite logic, to ensure that the
configured $(includedir) is not cancelled by the mingwxx-filesystem
rpm macros.
+ add --disable-db-install configure option, to simplify building
cross-compile support packages.
+ add mingw-ncurses.spec file, for testing cross-compiles.
+ improve configure macros from ongoing work on cdk, dialog, xterm:
+ CF_ADD_LIB_AFTER - fix a problem with -Wl options
+ CF_RPATH_HACK - add missing result-message
+ CF_SHARED_OPTS - modify to use $rel_builddir in cygwin and mingw
dll symbols (which can be overridden) rather than explicit "../".
+ CF_SHARED_OPTS - modify NetBSD and DragonFly symbols to use ${CC}
rather than ${LD} to improve rpath support.
+ CF_SHARED_OPTS - add a symbol to denote the temporary files that
are created by the macro, to simplify clean-rules.
+ CF_X_ATHENA - trim extra libraries to work with -Wl,--as-needed
+ fix a regression in hashed-database support for NetBSD, which uses
the key-size differently from other implementations (cf: 20121229).
+ add fallback defs for <inttypes.h> and <stdint.h> (cf: 20120225).
+ add check for size of wchar_t, use that to suppress a chunk of
wcwidth.h in MinGW port.
+ quiet linker warnings for MinGW cross-compile with dll's using the
--enable-auto-import flag.
+ add ncurses.map rule to ncurses/Makefile to help diagnose symbol
table issues.
+ modify mvcur() to distinguish between internal use by the ncurses
library, and external callers, preventing it from reading the content
of the screen which is only nonblank when curses calls have updated
it. This makes test/dots_mvcur.c avoid painting colored cells in
the left margin of the display.
+ minor fix to test/dots_mvcur.c
+ move configured symbols USE_DATABASE and USE_TERMCAP to term.h as
NCURSES_USE_DATABASE and NCURSES_USE_TERMCAP to allow consistent
use of these symbols in term_entry.h
+ corrected ifdefs in test/testcurs.c to allow comparison of mouse
interface versus pdcurses (cf: 20130316).
+ add pow() to configure-check for math library, needed since
20121208 for test/hanoi (Debian #708056).
+ regenerated html manpages.
+ update doctype used for html documentation.
+ additional fix for tic.c, to allocate missing buffer space.
+ eliminate configure-script warnings for gen-pkgconfig.in
+ correct typo in sgr string for sun-color,
add bold for consistency with sgr,
change smso for consistency with sgr -TD
+ correct typo in sgr string for terminator -TD
+ add blink to the attributes masked by ncv in linux-16color (report
by Benjamin Sittler)
+ improve warning message from post-load checking for missing "%?"
operator by tic/infocmp by showing the entry name and capability.
+ minor formatting improvement to tic/infocmp -f option to ensure
line split after "%;".
+ amend scripting for --with-cxx-shared option to handle the debug
library "libncurses++_g.a" (report by Sven Joachim).
+ amend change to toe.c for reading from /dev/zero, to ensure that
there is a buffer for the temporary filename (cf: 20120324).
+ regenerated html manpages.
+ fix typo in terminfo.head (report by Sven Joachim, cf: 20130302).
+ updated some autoconf macros:
+ CF_ACVERSION_CHECK, from byacc 1.9 20130304
+ CF_INTEL_COMPILER, CF_XOPEN_SOURCE from luit 2.0-20130217
+ add configure option --with-cxx-shared to permit building
libncurses++ as a shared library when using g++, e.g., the same
limitations as libtool but better integrated with the usual build
configuration (Redhat 911540).
+ modify MKkey_defs.sh to filter out build-path which was unnecessarily
shown in curses.h (Debian #689131).
+ further fixes to mvcur to pass callback function (cf: 20130112),
needed to make test/dots_mvcur work.
+ reduce calls to SetConsoleActiveScreenBuffer in win_driver.c, to
help reduce flicker.
+ modify configure script to omit "+b" from linker options for very
old HP-UX systems (report by Dennis Grevenstein)
+ add HP-UX workaround for missing EILSEQ on old HP-UX systems (patch
by Dennis Grevenstein).
+ restore memmove/strdup support for antique systems (request by
Dennis Grevenstein).
+ change %l behavior in tparm to push the string length onto the stack
rather than saving the formatted length into the output buffer
(report by Roy Marples, cf: 980620).
+ realign these related pages:
curs_add_wchstr.3x
curs_addchstr.3x
curs_addstr.3x
curs_addwstr.3x
and fix a long-ago error in curs_addstr.3x which said that a -1
length parameter would only write as much as fit onto one line
(report by Reuben Thomas).
+ remove obsolete fallback _nc_memmove() for memmove()/bcopy().
+ remove obsolete fallback _nc_strdup() for strdup().
+ cancel any debug-rpm in package/ncurses.spec
+ reviewed vte-2012, reverted most of the change since it was incorrect
based on testing with tack -TD
+ un-cancel the initc in vte-256color, since this was implemented
starting with version 0.20 in 2009 -TD
+ improve CF_GCC_VERSION to work around Debian's customization of gcc
--version message.
+ improve configure macros as done in byacc:
+ drop 2.13 compatibility; use 2.52.xxxx version only since EMX port
has used that for a while.
+ add 3rd parameter to AC_DEFINE's to allow autoheader to run, i.e.,
for experimental use.
+ remove unused configure macros.
+ modify configure script and makefiles to quiet new autoconf warning
for LIBS_TO_MAKE variable.
+ modify configure script to show $PATH_SEPARATOR variable.
+ update config.guess, config.sub
+ add a null-pointer check in _nc_flush (cf: 20120825).
+ fix a case in _nc_scroll_optimize() where the _oldnums_list array
might not be allocated.
+ improve comparisons in configure.in for unset shell variables.
+ update test/configure, adding check for tinfo library.
+ improve limit-checks for the getch fifo (report by Werner Fink).
+ fix a remaining mismatch between $with_echo and the symbols updated
by CF_DISABLE_ECHO affecting parameters for mk-2nd.awk (report by
Sven Joachim, cf: 20120317).
+ modify followup check for pkg-config's library directory in the
--enable-pc-files option to validate syntax (report by Sven Joachim,
cf: 20110716).
+ remove p6 (bold) from opus3n1+ for consistency -TD
+ remove acs stuff from env230 per clues in Ingres termcap -TD
+ modify env230 sgr/sgr0 to match other capabilities -TD
+ modify smacs/rmacs in bq300-8 to match sgr/sgr0 -TD
+ make sgr for dku7202 agree with other caps -TD
+ make sgr for ibmpc agree with other caps -TD
+ make sgr for tek4107 agree with other caps -TD
+ make sgr for ndr9500 agree with other caps -TD
+ make sgr for sco-ansi agree with other caps -TD
+ make sgr for d410 agree with other caps -TD
+ make sgr for d210 agree with other caps -TD
+ make sgr for d470c, d470c-7b agree with other caps -TD
+ remove redundant AC_DEFINE for NDEBUG versus Makefile definition.
+ fix a back-link in _nc_delink_entry(), which is needed if ncurses is
configured with --enable-termcap and --disable-getcap.
+ update Ada95/configure to use CF_DISABLE_ECHO (cf: 20120317).
+ correct order of use-clauses in st-256color -TD
+ modify configure script to look for gnatgcc if the Ada95 binding
is built, in preference to the default gcc/cc (suggested by
Nicolas Boulenguez).
+ modify configure script to ensure that the same -On option used for
the C compiler in CFLAGS is used for ADAFLAGS rather than simply
using -O3 (suggested by Nicolas Boulenguez)
+ correct a check made in lib_napms.c, so that terminfo applications
can again use napms() (cf: 20110604).
+ add a note in tic.h regarding required casts for ABSENT_BOOLEAN
(cf: 20040327).
+ correct scripting for --disable-echo option in test/configure.
+ amend check for missing c++ compiler to work when no error is
reported, and no variables set (cf: 20021206).
+ add/use configure macro CF_DISABLE_ECHO.
+ modify configure script to allow creating dll's for MinGW when
cross-compiling.
+ add --enable-string-hacks option to control whether strlcat and
strlcpy may be used. The same issue applies to OpenBSD's warnings
about snprintf, noting that this function is weakly standardized.
+ add configure checks for strlcat, strlcpy and snprintf, to help
reduce bogus warnings with OpenBSD builds.
+ build-fix for OpenBSD 4.9 to supply consistent intptr_t declaration
(cf:20111231)
+ update config.guess, config.sub
+ correct CF_ETIP_DEFINES configure macro, making it exit properly on
the first success (patch by Pierre Labastie).
+ improve configure macro CF_MKSTEMP by moving existence-check for
mkstemp out of the AC_TRY_RUN, to help with cross-compiles.
+ improve configure macro CF_FUNC_POLL from luit changes to detect
broken implementations, e.g., with Mac OS X.
+ add configure option --with-tparm-arg
+ build-fix for MinGW cross-compiling, so that make_hash does not
depend on TTY definition (cf: 20111008).
+ make sgr for xterm-pcolor agree with other caps -TD
+ make sgr for att5425 agree with other caps -TD
+ make sgr for att630 agree with other caps -TD
+ make sgr for linux entries agree with other caps -TD
+ make sgr for tvi9065 agree with other caps -TD
+ make sgr for ncr260vt200an agree with other caps -TD
+ make sgr for ncr160vt100pp agree with other caps -TD
+ make sgr for ncr260vt300an agree with other caps -TD
+ make sgr for aaa-60-dec-rv, aaa+dec agree with other caps -TD
+ make sgr for cygwin, cygwinDBG agree with other caps -TD
+ add configure option --with-xterm-kbs to simplify configuration for
Linux versus most other systems.
+ add --with-lib-prefix option to allow configuring for old/new flavors
of OS/2 EMX.
+ modify check for gnat version to allow for year, as used in FreeBSD
port.
+ modify check_existence() in db_iterator.c to simply check if the
path is a directory or file, according to the need. Checking for
directory size also gives no usable result with OS/2 (cf: 20120107).
+ support OS/2 kLIBC (patch by KO Myung-Han).
+ various improvments for MinGW (patch by Juergen Pfeifer):
+ modify stat() calls to ignore the st_size member
+ drop mk-dlls.sh script.
+ change recommended regular expression library.
+ modify rain.c to allow for threaded configuraton.
+ modify tset.c to allow for case when size-change logic is not used.
+ review/fix places in manpages where --program-prefix configure option
was not being used.
+ add -D option to infocmp, to show the database locations that it
could use.
+ fix build for the special case where term-driver, ticlib and termlib
are all enabled. The terminal driver depends on a few features in
the base ncurses library, so tic's dependencies include both ncurses
and termlib.
+ fix build work for term-driver when --enable-wgetch-events option is
enabled.
+ use <stdint.h> types to fix some questionable casts to void*.
+ modify make_db_path() to allow creating "terminfo.db" in the same
directory as an existing "terminfo" directory. This fixes a case
where switching between hashed/filesystem databases would cause the
new hashed database to be installed in the next best location -
root's home directory.
+ add variable cf_cv_prog_gnat_correct to those passed to
config.status, fixing a problem with Ada95 builds (cf: 20111022).
+ change feature test from _XPG5 to _XOPEN_SOURCE in two places, to
accommodate broken implementations for _XPG6.
+ eliminate usage of NULL symbol from etip.h, to reduce header
interdependencies.
+ add configure check to decide when to add _XOPEN_SOURCE define to
compiler options, i.e., for Solaris 10 and later (cf: 20100403).
This is a workaround for gcc 4.6, which fails to build the c++
binding if that symbol is defined by the application, due to
incorrectly combining the corresponding feature test macros
(report by Peter Kruse).
+ correct logic for discarding mouse events, retaining the partial
events used to build up click, double-click, etc, until needed
(cf: 20110917).
+ fix configure script to avoid creating unused Ada95 makefile when
gnat does not work.
+ cleanup width-related gcc 3.4.3 warnings for 64-bit platform, for the
internal functions of libncurses. The external interface of courses
uses bool, which still produces these warnings.
+ modify _nc_read_tic_entry() so that hashed-database is checked before
filesystem.
+ updated CF_CURSES_LIBS check in test/configure script.
+ modify configure script and makefiles to split TIC_ARGS and
TINFO_ARGS into pieces corresponding to LDFLAGS and LIBS variables,
to help separate searches for tic- and tinfo-libraries (patch by Nick
Alcock aka "Nix").
+ build-fix for lib_mouse.c changes (ch: 20110917).
+ modify misc/gen_edit.sh to select a "linux" entry which works with
the current kernel rather than assuming it is always "linux3.0"
(cf: 20110716).
+ revert a change to getmouse() which had the undesirable side-effect
of suppressing button-release events (report by Damien Guibouret,
cf: 20100102).
+ add xterm+kbs fragment from xterm #272 -TD
+ add configure option --with-pkg-config-libdir to provide control over
the actual directory into which pc-files are installed, do not use
the pkg-config environment variables (discussion with Frederic L W
Meunier).
+ add link to mailing-list archive in announce.html.in, as done in
FAQ (prompted by question by Andrius Bentkus).
+ improve manpage install by adjusting the "#include" examples to
show the ncurses-subdirectory used when --disable-overwrite option
is used.
+ install an alias for "curses" to the ncurses manpage, tied to the
--with-curses-h configure option (suggested by Reuben Thomas).
+ replace an assert() in _nc_Free_Argument() with a regular null
pointer check (report/analysis by Franjo Ivancic).
+ modify configure --enable-pc-files option to take into account the
PKG_CONFIG_PATH variable (report by Frederic L W Meunier).
+ add/use xterm+tmux chunk from xterm #271 -TD
+ resync xterm-new entry from xterm #271 -TD
+ add E3 extended capability to linux-basic (Miroslav Lichvar)
+ add linux2.2, linux2.6, linux3.0 entries to give context for E3 -TD
+ add SI/SO change to linux2.6 entry (Debian #515609) -TD
+ fix inconsistent tabset path in pcmw (Todd C. Miller).
+ remove a backslash which continued comment, obscuring altos3
definition with OpenBSD toolset (Nicholas Marriott).
