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

Merge branch 'NetHack-3.6.0' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6.0

Browse Source
This commit is contained in:
nhmall
2016-02-01 21:58:28 -05:00
parent 297d4d11e7 2e9a2002c4
commit 309ad50f61
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/alloc.c
View File

@@ -1,12 +1,11 @@
/* NetHack 3.6 alloc.c $NHDT-Date: 1446975460 2015/11/08 09:37:40 $ $NHDT-Branch: master $:$NHDT-Revision: 1.14 $ */ /* NetHack 3.6 alloc.c $NHDT-Date: 1454376505 2016/02/02 01:28:25 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.16 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
/* to get the malloc() prototype from system.h */ /* to get the malloc() prototype from system.h */
#define ALLOC_C /* comment line for pre-compiled headers */ #define ALLOC_C /* comment line for pre-compiled headers */
/* since this file is also used in auxiliary programs, don't include all the /* since this file is also used in auxiliary programs, don't include all the
* function declarations for all of nethack function declarations for all of nethack */
*/
#define EXTERN_H /* comment line for pre-compiled headers */ #define EXTERN_H /* comment line for pre-compiled headers */
#include "config.h" #include "config.h"
@@ -23,9 +22,7 @@ static boolean tried_heaplog = FALSE;
#endif #endif
long *FDECL(alloc, (unsigned int)); long *FDECL(alloc, (unsigned int));
extern void extern void VDECL(panic, (const char *, ...)) PRINTF_F(1, 2);
VDECL(panic, (const char *, ...))
PRINTF_F(1, 2);
long * long *
alloc(lth) alloc(lth)

4
sys/unix/Makefile.utl
View File

@@ -1,5 +1,5 @@
# Makefile for NetHack's utility programs. # Makefile for NetHack's utility programs.
# NetHack 3.6 Makefile.utl $NHDT-Date: 1449386560 2015/12/06 07:22:40 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.27 $ # NetHack 3.6 Makefile.utl $NHDT-Date: 1454376585 2016/02/02 01:29:45 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.28 $
# Root of source tree: # Root of source tree:
NHSROOT=.. NHSROOT=..
@@ -310,7 +310,7 @@ dlb_main.o: dlb_main.c $(CONFIG_H) ../include/dlb.h ../include/date.h
# dependencies for tile utilities # dependencies for tile utilities
# #
TEXT_IO = tiletext.o tiletxt.o $(ONAMING) TEXT_IO = tiletext.o tiletxt.o $(OALLOC) $(ONAMING)
GIFREADERS = gifread.o $(OALLOC) GIFREADERS = gifread.o $(OALLOC)
PPMWRITERS = ppmwrite.o $(OALLOC) PPMWRITERS = ppmwrite.o $(OALLOC)