From: nhmall Date: Sun, 22 Aug 2021 02:47:55 +0000 (-0400) Subject: build issue without DLB defined X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1c270ea31bc4430d1ad967ed2468faef99515f01;p=nethack build issue without DLB defined --- diff --git a/sys/unix/hints/linux.2020 b/sys/unix/hints/linux.2020 index 76701643c..dc7f23df8 100755 --- a/sys/unix/hints/linux.2020 +++ b/sys/unix/hints/linux.2020 @@ -53,7 +53,7 @@ GAMEGRP = games #-INCLUDE compiler.2020 # NetHack sources control -NHCFLAGS+=-DDLB +#NHCFLAGS+=-DDLB NHCFLAGS+=-DHACKDIR=\"$(HACKDIR)\" NHCFLAGS+=-DDEFAULT_WINDOW_SYS=\"$(WANT_DEFAULT)\" NHCFLAGS+=-DSYSCF -DSYSCF_FILE=\"$(HACKDIR)/sysconf\" -DSECURE diff --git a/util/dlb_main.c b/util/dlb_main.c index db0b1f41a..aab866d64 100644 --- a/util/dlb_main.c +++ b/util/dlb_main.c @@ -14,11 +14,13 @@ #include #endif -static void grow_ld(libdir **, int *, int); static void xexit(int) NORETURN; +char *eos(char *); /* also used by dlb.c */ +FILE *fopen_datafile(const char *, const char *); #ifdef DLB #ifdef DLBLIB +static void grow_ld(libdir **, int *, int); #define DLB_DIRECTORY "Directory" /* name of lib directory */ #define LIBLISTFILE "dlb.lst" /* default list file */ @@ -27,9 +29,6 @@ static void xexit(int) NORETURN; extern boolean open_library(const char *, library *); extern void close_library(library *); -char *eos(char *); /* also used by dlb.c */ -FILE *fopen_datafile(const char *, const char *); - static void Write(int, char *, long); static void usage(void) NORETURN; static void verbose_help(void) NORETURN; @@ -128,14 +127,8 @@ Write(int out, char *buf, long len) xexit(EXIT_FAILURE); } } - -char * -eos(char *s) -{ - while (*s) - s++; - return s; -} +#endif /* DLBLIB */ +#endif /* DLB */ /* open_library(dlb.c) needs this (which normally comes from src/files.c) */ FILE * @@ -144,11 +137,24 @@ fopen_datafile(const char *filename, const char *mode) return fopen(filename, mode); } -#endif /* DLBLIB */ -#endif /* DLB */ + char * +eos(char *s) +{ + while (*s) + s++; + return s; +} int -main(int argc, char **argv) +main(int argc +#ifndef DLB + UNUSED +#endif + , char **argv +#ifndef DLB + UNUSED +#endif + ) { #ifdef DLB #ifdef DLBLIB