From bd2cd75f7a8b3d9e1a77b5aa1be0cc587abb9846 Mon Sep 17 00:00:00 2001 From: nhmall Date: Thu, 27 Jun 2019 23:12:06 -0400 Subject: [PATCH] PDCurses requires PDC_NCMOUSE for compatibility with ncurses The PDC_NCMOUSE has to be defined on the command line or above the #include entries in win/curses/cursmisc.c. This does the former command line change. --- include/wincurs.h | 6 ------ sys/winnt/Makefile.msc | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/include/wincurs.h b/include/wincurs.h index 79122430d..127cd0faf 100644 --- a/include/wincurs.h +++ b/include/wincurs.h @@ -38,12 +38,6 @@ extern WINDOW *mapwin, *statuswin, *messagewin; /* Main windows */ #endif /* !__APPLE__ && !PDCURSES */ #define CURSES_DARK_GRAY 17 #define MAP_SCROLLBARS -#ifdef PDCURSES -# define getmouse nc_getmouse -# ifndef NCURSES_MOUSE_VERSION -# define NCURSES_MOUSE_VERSION -# endif -#endif #if !defined(A_LEFTLINE) && defined(A_LEFT) #define A_LEFTLINE A_LEFT diff --git a/sys/winnt/Makefile.msc b/sys/winnt/Makefile.msc index d2dd88414..fb8cd9b7e 100644 --- a/sys/winnt/Makefile.msc +++ b/sys/winnt/Makefile.msc @@ -634,7 +634,7 @@ DLB = #========================================== {$(WCURSES)}.c{$(OBJ)}.o: - @$(cc) $(PDCINCL) $(cflagsBuild) -Fo$@ $< + @$(cc) -DPDC_NCMOUSE $(PDCINCL) $(cflagsBuild) -Fo$@ $< #{$(WCURSES)}.txt{$(DAT)}.txt: # @copy $< $@