diff options
| author |   Matti Picus <matti.picus@gmail.com> | 2021-03-31 14:39:13 +0300 |
|---|---|---|
| committer | Matti Picus <matti.picus@gmail.com> | 2021-03-31 14:39:13 +0300 |
| commit | 1f255416738fb61e6b57e32a02157b157213f05c (patch) | |
| tree | 13d3323817bdf21f707d77689fdde8df4fc744c7 | |
| parent | merge default into branch (diff) | |
| parent | leave a wrapped setupterm rpython function to avoid including "term.h" (diff) | |
| download | pypy-1f255416738fb61e6b57e32a02157b157213f05c.tar.gz pypy-1f255416738fb61e6b57e32a02157b157213f05c.tar.bz2 pypy-1f255416738fb61e6b57e32a02157b157213f05c.zip | |
merge default into branch
| -rw-r--r-- | pypy/module/_minimal_curses/fficurses.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pypy/module/_minimal_curses/fficurses.py b/pypy/module/_minimal_curses/fficurses.py index 488f033305..d4ed5e65cd 100644 --- a/pypy/module/_minimal_curses/fficurses.py +++ b/pypy/module/_minimal_curses/fficurses.py @@ -75,7 +75,7 @@ eci = eci.copy_without('includes') eci = eci.merge(ExternalCompilationInfo( post_include_bits=[ - "RPY_EXTERN int setupterm(char *, int, int *);\n" + "RPY_EXTERN int rpy_curses_setupterm(char *, int, int *);\n" "RPY_EXTERN char *rpy_curses_tigetstr(char *);\n" "RPY_EXTERN char *rpy_curses_tparm(char *, int, int, int, int," " int, int, int, int, int);" @@ -85,6 +85,11 @@ eci = eci.merge(ExternalCompilationInfo( %(include_lines)s RPY_EXTERN +int rpy_curses_setupterm(char *t, int fd, int *errret) { + return setupterm(t, fd, errret); +} + +RPY_EXTERN char *rpy_curses_tigetstr(char *capname) { char *res = tigetstr(capname); |