diff --git a/src/decl.c b/src/decl.c index 4640d3534..cba20bfc7 100644 --- a/src/decl.c +++ b/src/decl.c @@ -1,4 +1,4 @@ -/* SCCS Id: @(#)decl.c 3.5 2005/11/19 */ +/* SCCS Id: @(#)decl.c 3.5 2006/07/10 */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -194,8 +194,8 @@ NEARDATA struct obj *billobjs = (struct obj *)0; /* used to zero all elements of a struct obj */ NEARDATA struct obj zeroobj = DUMMY; -/* used to zero out union any*/ -NEARDATA anything zeroany = DUMMY; +/* used to zero out union any; initializer deliberately omitted */ +NEARDATA anything zeroany; /* originally from dog.c */ NEARDATA char dogname[PL_PSIZ] = DUMMY; diff --git a/src/hack.c b/src/hack.c index a5b52c8d1..00a072c6d 100644 --- a/src/hack.c +++ b/src/hack.c @@ -61,7 +61,7 @@ void zero_anything(any) anything *any; { - (void) memset((genericptr_t)any, 0, sizeof(anything)); + *any = zeroany; } boolean