4 files changed, 29 insertions, 5 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index d8ec0579422..10758d80872 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,23 @@
+2013-03-26  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix incompatibilities between MinGW.org and MinGW64 headers.
+        * ntlib.c (struct timespec) [!_TIMEZONE_DEFINED]: Define the
+        struct only if _TIMEZONE_DEFINED is not defined.
+
+2013-03-23  cg  <chengang31@gmail.com>  (tiny change)
+
+        * makefile.w32-in (LIB_SRC): Move before first use.
+
+2013-03-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * pop.c: Fix ERRMAX typo (Bug#13925).
+        (socket_connection) [!HAVE_KRB5_ERROR_TEXT && HAVE_KRB5_ERROR_E_TEXT]:
+        Use ERROR_MAX, not ERRMAX.
+
+2013-03-16  Glenn Morris  <rgm@gnu.org>
+
+        * Version 24.3 released.
+
 2013-03-13  Paul Eggert  <eggert@cs.ucla.edu>
 
         File synchronization fixes (Bug#13944).
@@ -6,8 +26,8 @@
         * emacsclient.c (main): Use fdatasync, not fsync, since we don't
         care about metadata.  Keep trying if interrupted.
         * movemail.c (main, popmail): Don't worry about BSD_SYSTEM, since
-        fsync is available everywhere (or there is a substitute).  Don't
-        report an error if fsync returns EINVAL.
+        fsync is available everywhere (or there is a substitute).
+        Don't report an error if fsync returns EINVAL.
 
         Static checking by Sun C 5.12.
         * etags.c (analyse_regex): Omit unreachable code.
@@ -5182,7 +5202,7 @@
         (longopts): New long options without short counterpart are
         globals, members, no-globals, no-members.  Regexp options are now
         defined  conditionally to ETAGS_REGEXPS.
-        (print_help): Updated.
+        (print_help): Update.
 
 1997-05-22  Francesco Potortì  <F.Potorti@cnuce.cnr.it>
 
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 8d016bc16be..5ec559ff985 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -27,6 +27,7 @@ LOCAL_FLAGS	= -DNO_LDAV=1 -DNO_ARCHIVES=1 -I../lib \
                   -I../nt/inc -I../src $(EMACS_EXTRA_C_FLAGS)
 
 LIBS            = $(BASE_LIBS) $(ADVAPI32)
+LIB_SRC         = .
 
 # The following target is used by makefile.w32-in files in other directories.
 make-docfile:   $(BLD)/make-docfile.exe
@@ -360,7 +361,6 @@ TAGS: $(BLD)/etags.exe *.c *.h
 ### DEPENDENCIES ###
 
 EMACS_ROOT      = ..
-LIB_SRC         = .
 SRC             = $(EMACS_ROOT)/src
 NT_INC          = $(EMACS_ROOT)/nt/inc
 GNU_LIB         = $(EMACS_ROOT)/lib
diff --git a/lib-src/ntlib.c b/lib-src/ntlib.c
index f43117457cb..849abc2ede5 100644
--- a/lib-src/ntlib.c
+++ b/lib-src/ntlib.c
@@ -34,11 +34,15 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "ntlib.h"
 
+/* MinGW64 defines _TIMEZONE_DEFINED and defines 'struct timespec' in
+   its system headers.  */
+#ifndef _TIMEZONE_DEFINED
 struct timezone
 {
   int           tz_minuteswest; /* minutes west of Greenwich */
   int           tz_dsttime;     /* type of dst correction */
 };
+#endif
 
 #define MAXPATHLEN _MAX_PATH
 
diff --git a/lib-src/pop.c b/lib-src/pop.c
index ba384db3d19..1f3f82baa68 100644
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -1198,7 +1198,7 @@ socket_connection (char *host, int flags)
             }
 #elif defined HAVE_KRB5_ERROR_E_TEXT
           if (err_ret && err_ret->e_text && **err_ret->e_text)
-            snprintf (pop_error + pop_error_len, ERRMAX - pop_error_len,
+            snprintf (pop_error + pop_error_len, ERROR_MAX - pop_error_len,
                       " [server says '%s']", *err_ret->e_text);
 #endif
           if (err_ret)