Mps br/vc9: undo #pragma warning (4996) in mpslib.h and mpswin.h; testlib.c is where it is needed

Copied from Perforce
 Change: 166143
 ServerID: perforce.ravenbrook.com

3 files changed, 4 insertions, 3 deletions

diff --git a/mps/code/mpslib.h b/mps/code/mpslib.h
index ebdf2b27e3c..094975b3cf7 100644
--- a/mps/code/mpslib.h
+++ b/mps/code/mpslib.h
@@ -15,7 +15,6 @@
 
 #include <stddef.h>
 
-#pragma warning( disable : 4996 )
 
 extern int mps_lib_get_EOF(void);
 #define mps_lib_EOF     (mps_lib_get_EOF())
diff --git a/mps/code/mpswin.h b/mps/code/mpswin.h
index 3adb639e49b..99317fb790a 100644
--- a/mps/code/mpswin.h
+++ b/mps/code/mpswin.h
@@ -13,8 +13,7 @@
 
 /* Suppress Visual C warnings from windows.h at warning level 4. */
 #ifdef MPS_BUILD_MV
-#pragma warning(disable: 4115 4201 4209 4214 4996)
-/* 4996 = insecure C runtime, added in a rush for VC9 (2008) RHSK */
+#pragma warning(disable: 4115 4201 4209 4214)
 #endif
 
 #include <windows.h>
diff --git a/mps/code/testlib.c b/mps/code/testlib.c
index 8cf36491cd3..5a1941ab30c 100644
--- a/mps/code/testlib.c
+++ b/mps/code/testlib.c
@@ -70,6 +70,9 @@ mps_addr_t rnd_addr(void)
 
 /* randomize -- randomize the generator, or initialize to replay */
 
+/* for sscanf */
+#pragma warning( disable : 4996 )
+
 void randomize(int argc, char **argv)
 {
   int i, k, n;