nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

incorporate 3.6.7+ build fix for VMS

Browse Source 
Make sure CLR_MAX is defined when winprocs.h uses it.
sys/vms/vmsmail.c uses wintypes.h and winprocs.h without hack.h;
a change in 3.6.3 broke that but wasn't noticed until now.

I haven't added a fixes entry since we don't know whether 3.7.x
will eventually be buildable on VMS.
This commit is contained in:
PatR
2023-05-10 12:47:42 -07:00
parent 81884a92e0
commit 65debc1adb
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/winprocs.h
View File

@@ -1,4 +1,4 @@
/* NetHack 3.7 winprocs.h $NHDT-Date: 1596498572 2020/08/03 23:49:32 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.56 $ */
/* NetHack 3.7 winprocs.h $NHDT-Date: 1683748057 2023/05/10 19:47:37 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.74 $ */
/* Copyright (c) David Cohrs, 1992 */
/* NetHack may be freely redistributed. See license for details. */
@@ -6,6 +6,9 @@
#define WINPROCS_H
#include "botl.h"
#ifndef CLR_MAX
#include "color.h"
#endif
enum wp_ids { wp_tty = 1, wp_X11, wp_Qt, wp_mswin, wp_curses,
wp_chainin, wp_chainout, wp_safestartup, wp_shim,

6
sys/vms/Makefile.src
View File

@@ -1,5 +1,5 @@
# NetHack Makefile (VMS) - for building nethack itself.
# NetHack 3.7 Makefile.src $NHDT-Date: 1609347463 2020/12/30 16:57:43 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.55 $
# NetHack 3.7 Makefile.src $NHDT-Date: 1683748060 2023/05/10 19:47:40 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.60 $
# Copyright (c) 2011 by Robert Patrick Rankin
# NetHack may be freely redistributed. See license for details.
@@ -410,7 +410,7 @@ vmsunix.obj : $(VMS)vmsunix.c $(HACK_H)
vmsmisc.obj : $(VMS)vmsmisc.c $(VMS)oldcrtl.c $(CONFIG_H)
vmsfiles.obj : $(VMS)vmsfiles.c $(CONFIG_H)
vmsmail.obj : $(VMS)vmsmail.c $(CONFIG_H) $(INC)mail.h \
$(INC)wintype.h $(INC)winprocs.h
$(INC)wintype.h $(INC)winprocs.h $(INC)color.h
# conditionally used code -- VMS always wants these
isaac64.obj : isaac64.c $(CONFIG_H) $(INC)isaac64.h
random.obj : random.c $(HACK_H)
@@ -419,7 +419,7 @@ random.c : $(SYSSHR)random.c
tclib.obj : tclib.c $(CONFIG_H)
tclib.c : $(SYSSHR)tclib.c
copy $(SYSSHR)tclib.c tclib.c
# user interface code -- VMS uses tty or curses or both, not X11
# user interface code -- VMS uses tty, not curses or X11
getline.obj : $(TTY)getline.c $(HACK_H) $(INC)func_tab.h
termcap.obj : $(TTY)termcap.c $(HACK_H) $(INC)tcap.h
topl.obj : $(TTY)topl.c $(HACK_H) $(INC)tcap.h