diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 6076dc172e..5be53cf6ad 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -663,9 +663,6 @@ OPTFLAG = /Ox ! if "$(OPTIMIZE)" != "SPACE" OPTFLAG = $(OPTFLAG) /GL ! endif -# Visual Studio 2005 has 'deprecated' many of the standard CRT functions -CFLAGS_DEPR = /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE -CFLAGS = $(CFLAGS) $(CFLAGS_DEPR) ! endif # (/Wp64 is deprecated in VC9 and generates an obnoxious warning.) @@ -707,6 +704,12 @@ CFLAGS = $(CFLAGS) /Zl /MTd ! endif !endif # DEBUG +!if $(MSVC_MAJOR) >= 8 +# Visual Studio 2005 has 'deprecated' many of the standard CRT functions +CFLAGS_DEPR = /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE +CFLAGS = $(CFLAGS) $(CFLAGS_DEPR) +!endif + !include Make_all.mak !include testdir\Make_all.mak diff --git a/src/version.c b/src/version.c index f10dcd55d2..5d76c5ee82 100644 --- a/src/version.c +++ b/src/version.c @@ -738,6 +738,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 317, /**/ 316, /**/