011-fix-ncursesw-definition-colisions.patch 949 B

123456789101112131415161718192021222324
  1. diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
  2. index 3bf2ca7..c156964 100644
  3. --- a/Modules/_cursesmodule.c
  4. +++ b/Modules/_cursesmodule.c
  5. @@ -116,7 +116,6 @@ char *PyCursesVersion = "2.2";
  6. #defines many common symbols (such as "lines") which breaks the
  7. curses module in other ways. So the code will just specify
  8. explicit prototypes here. */
  9. -extern int setupterm(char *,int,int *);
  10. #ifdef __sgi
  11. #include <term.h>
  12. #endif
  13. diff --git a/setup.py b/setup.py
  14. index af9a414..ee19ecd 100644
  15. --- a/setup.py
  16. +++ b/setup.py
  17. @@ -1349,7 +1349,6 @@ class PyBuildExt(build_ext):
  18. panel_library = 'panel'
  19. if curses_library == 'ncursesw':
  20. curses_defines.append(('HAVE_NCURSESW', '1'))
  21. - curses_includes.append('/usr/include/ncursesw')
  22. # Bug 1464056: If _curses.so links with ncursesw,
  23. # _curses_panel.so must link with panelw.
  24. panel_library = 'panelw'