From b2e37dad6876445f53037e82280cc2b77e6a5086 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 12 Mar 2013 15:00:07 -0700 Subject: * pop.c: Fix ERRMAX typo (Bug#13925). (socket_connection) [!HAVE_KRB5_ERROR_TEXT && HAVE_KRB5_ERROR_E_TEXT]: Use ERROR_MAX, not ERRMAX. --- lib-src/ChangeLog | 6 ++++++ lib-src/pop.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 871f572facd..68594311332 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,9 @@ +2013-03-12 Paul Eggert + + * 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-11 Glenn Morris * Version 24.3 released. 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) -- cgit v1.2.1 From d7158313e21be4fb986627b38c2a5decc5844374 Mon Sep 17 00:00:00 2001 From: cg Date: Sat, 23 Mar 2013 17:30:38 +0200 Subject: Fix MSVC compilation problem in lib-src. lib-src/makefile.w32-in (LIB_SRC): Move before first use. --- lib-src/ChangeLog | 4 ++++ lib-src/makefile.w32-in | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 0d7a0a4591e..03412aa23b9 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,7 @@ +2013-03-23 cg (tiny change) + + * makefile.w32-in (LIB_SRC): Move before first use. + 2013-03-16 Paul Eggert * pop.c: Fix ERRMAX typo (Bug#13925). 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 -- cgit v1.2.1 From b88b62dec99cec327c6bae67ef4d3a8bc5b601ca Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 26 Mar 2013 10:21:27 +0200 Subject: Fix more incompatibilities between MinGW.org and MinGW64 headers Reported by ׃scar Fuentes in http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00699.html and in http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00707.html. nt/inc/ms-w32.h (USE_NO_MINGW_SETJMP_TWO_ARGS) [_W64]: Define to 1. For MinGW64, include sys/types.h and time.h. nt/inc/sys/time.h (struct timeval) [!_W64]: Guard definition with _W64. (struct timezone) [!_TIMEZONE_DEFINED]: Guard definition with _TIMEZONE_DEFINED. nt/addpm.c (_WIN32_IE) [_W64]: For MinGW64, don't define to 0x400. nt/inc/sys/stat.h: Remove _CRTIMP from prototypes of fstat, stat, lstat, and fstatat. lib-src/ntlib.c (struct timespec) [!_TIMEZONE_DEFINED]: Define the struct only if _TIMEZONE_DEFINED is not defined. src/w32term.c (WCRANGE, GLYPHSET): Don't define if _W64 is defined. src/w32.c (REPARSE_DATA_BUFFER): Guard with MAXIMUM_REPARSE_DATA_BUFFER_SIZE being defined. --- lib-src/ChangeLog | 6 ++++++ lib-src/ntlib.c | 4 ++++ 2 files changed, 10 insertions(+) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 03412aa23b9..10758d80872 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,9 @@ +2013-03-26 Eli Zaretskii + + 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 (tiny change) * makefile.w32-in (LIB_SRC): Move before first use. 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 . */ #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 -- cgit v1.2.1