(tzname): Do not define in msvc8.

2006-12-29 14:49:25 +00:00
parent ec86967264
commit e37b3faf5b
2 changed files with 9 additions and 0 deletions
--- 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.
--- 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