From 26ac20503c8a1b30e74c46b071da91fda51b990e Mon Sep 17 00:00:00 2001 From: nhmall Date: Sat, 9 May 2020 18:07:56 -0400 Subject: [PATCH] fixup build for platforms without curses after drawing.c split An Undefined reference to decgraphics_mode_callback was possible if built for tty only. drawing.c had an #include "tcap.h" which is what actually defined TERMLIB. It isn't needed in drawing.c anymore, but it is needed in symbols.c, in order to get the define for TERMLIB so that decgraphics_mode_callback variable gets defined. The undefined reference was from win/tty/termcap.h in code that was #ifdef TERMLIB, but win/tty/termcap.h has the #include "tcap.h" --- src/drawing.c | 1 - src/symbols.c | 1 + win/tty/termcap.c | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/drawing.c b/src/drawing.c index aa32859a9..7d9932e19 100644 --- a/src/drawing.c +++ b/src/drawing.c @@ -7,7 +7,6 @@ #include "rm.h" #include "objclass.h" #include "monsym.h" -#include "tcap.h" /* Relevant header information in rm.h, objclass.h, and monsym.h. */ diff --git a/src/symbols.c b/src/symbols.c index efb76c37c..f8b0cf457 100644 --- a/src/symbols.c +++ b/src/symbols.c @@ -3,6 +3,7 @@ /* NetHack may be freely redistributed. See license for details. */ #include "hack.h" +#include "tcap.h" extern const uchar def_r_oc_syms[MAXOCLASSES]; /* drawing.c */ diff --git a/win/tty/termcap.c b/win/tty/termcap.c index cc9981032..37de8ff98 100644 --- a/win/tty/termcap.c +++ b/win/tty/termcap.c @@ -355,7 +355,7 @@ int state; } #ifdef TERMLIB -extern void NDECL((*decgraphics_mode_callback)); /* defined in drawing.c */ +extern void NDECL((*decgraphics_mode_callback)); /* defined in symbols.c */ static void NDECL(tty_decgraphics_termcap_fixup); /*