From 24099c50b287831c8d782b52d766c96797bd9142 Mon Sep 17 00:00:00 2001 From: nhmall Date: Fri, 13 Nov 2015 09:14:50 -0500 Subject: [PATCH] suppress an MSC warning in cppregex.cpp Changes to be committed: modified: include/ntconf.h --- include/ntconf.h | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/include/ntconf.h b/include/ntconf.h index 065eabd6f..48b149bfa 100644 --- a/include/ntconf.h +++ b/include/ntconf.h @@ -1,4 +1,4 @@ -/* NetHack 3.6 ntconf.h $NHDT-Date: 1432512777 2015/05/25 00:12:57 $ $NHDT-Branch: master $:$NHDT-Revision: 1.47 $ */ +/* NetHack 3.6 ntconf.h $NHDT-Date: 1447424077 2015/11/13 14:14:37 $ $NHDT-Branch: master $:$NHDT-Revision: 1.48 $ */ /* Copyright (c) NetHack PC Development Team 1993, 1994. */ /* NetHack may be freely redistributed. See license for details. */ @@ -107,11 +107,12 @@ extern void FDECL(interject, (int)); #ifdef YYPREFIX #pragma warning(disable : 4102) /* unreferenced label */ #endif -#if 0 -#pragma warning(disable : 4018) /* signed/unsigned mismatch */ -#pragma warning(disable : 4305) /* init, conv from 'const int' to 'char' */ -#endif +#ifdef __cplusplus +/* suppress a warning in cppregex.cpp */ +#pragma warning(disable : 4101) /* unreferenced local variable */ #endif +#endif /* _MSC_VER */ + #define RUNTIME_PORT_ID /* trigger run-time port identification for \ * identification of exe CPU architecture \ @@ -187,10 +188,6 @@ extern void FDECL(interject, (int)); #define FILENAME_CMP stricmp /* case insensitive */ #endif -#if 0 -extern char levels[], bones[], permbones[], -#endif /* 0 */ - /* this was part of the MICRO stuff in the past */ extern const char *alllevels, *allbones; extern char hackdir[]; -- 2.40.0