2 files changed, 9 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e624d93275c..28039b72e6c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-29  Jason Rumney  <jasonr@gnu.org>
+
+        * s/ms-w32.h (tzname): Do not define in msvc8.
+
+        * regex.c (regerror): Change parameter name err_code.
+
 2006-12-26  Richard Stallman  <rms@gnu.org>
 
         * search.c (Fsearch_forward): Doc fix.
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index a2281e926a5..455cfb2363f 100644
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -395,7 +395,10 @@ typedef int pid_t;
 #define strnicmp  _strnicmp
 #define stricmp   _stricmp
 #define tzset     _tzset
+
+#if !defined (_MSC_VER) || (_MSC_VER < 1400)
 #define tzname    _tzname
+#endif
 
 #ifdef HAVE_NTGUI
 #define abort   w32_abort