diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 1997-12-09 01:23:05 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 1997-12-09 01:23:05 +0000 |
| commit | eb5c0c47d0704e39ca34dc1845cb685a142a897d (patch) | |
| tree | bfba8c0947d9ac2e6ed0eff94a2589a62914cdab /lib/libtermlib | |
| parent | e0277928287efb00a1ddf2d6764b6d03ae8f71be (diff) | |
Make reset_prog_mode() and reset_shell_mode() in libtermlib weak
symbols so that they get overridden by the ones in libcurses.
This is rather gross but the curses versions are tightly coupled
to naughty bits private to libcurses. This allows reset_prog_mode()
and reset_shell_mode() to operate properly both with an without
libcurses linked in.
Diffstat (limited to 'lib/libtermlib')
| -rw-r--r-- | lib/libtermlib/reset_prog_mode.c | 7 | ||||
| -rw-r--r-- | lib/libtermlib/reset_shell_mode.c | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/lib/libtermlib/reset_prog_mode.c b/lib/libtermlib/reset_prog_mode.c index 4094b97166e..9154fe3488d 100644 --- a/lib/libtermlib/reset_prog_mode.c +++ b/lib/libtermlib/reset_prog_mode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: reset_prog_mode.c,v 1.1 1996/05/31 05:40:02 tholo Exp $ */ +/* $OpenBSD: reset_prog_mode.c,v 1.2 1997/12/09 01:23:02 millert Exp $ */ /* * Copyright (c) 1996 SigmaSoft, Th. Lockert <tholo@sigmasoft.com> @@ -31,13 +31,16 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: reset_prog_mode.c,v 1.1 1996/05/31 05:40:02 tholo Exp $"; +static char rcsid[] = "$OpenBSD: reset_prog_mode.c,v 1.2 1997/12/09 01:23:02 millert Exp $"; #endif #include <unistd.h> #include <sys/ioctl.h> #include "term.h" +int reset_prog_mode __P((void)) + __attribute__((weak)); + /* * Reset program mode as previously saved with def_prog_mode() */ diff --git a/lib/libtermlib/reset_shell_mode.c b/lib/libtermlib/reset_shell_mode.c index a903464792e..10f19633425 100644 --- a/lib/libtermlib/reset_shell_mode.c +++ b/lib/libtermlib/reset_shell_mode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: reset_shell_mode.c,v 1.1 1996/05/31 05:40:02 tholo Exp $ */ +/* $OpenBSD: reset_shell_mode.c,v 1.2 1997/12/09 01:23:03 millert Exp $ */ /* * Copyright (c) 1996 SigmaSoft, Th. Lockert <tholo@sigmasoft.com> @@ -31,13 +31,16 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: reset_shell_mode.c,v 1.1 1996/05/31 05:40:02 tholo Exp $"; +static char rcsid[] = "$OpenBSD: reset_shell_mode.c,v 1.2 1997/12/09 01:23:03 millert Exp $"; #endif #include <unistd.h> #include <sys/ioctl.h> #include "term.h" +int reset_shell_mode __P((void)) + __attribute__((weak)); + /* * Reset shell mode as previously saved with def_shell_mode() */ |