aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2013-12-18 18:21:17 +0200
committerEli Zaretskii2013-12-18 18:21:17 +0200
commit39e896c178c9e74ddfc4a8d30c3bc5629c692b84 (patch)
tree9dff47647c7c5fe76d051ec019d352ab9eaa9845
parent64e4c76edfed1464ee91848bba29ee0d385208e1 (diff)
downloademacs-39e896c178c9e74ddfc4a8d30c3bc5629c692b84.tar.gz
emacs-39e896c178c9e74ddfc4a8d30c3bc5629c692b84.zip
Avoid compiler warnings in w32fns.c:emacs_abort.
src/w32fns.c (emacs_abort): Use intptr_t as argument of INT_BUFSIZE_BOUND, to avoid compiler warnings.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/w32fns.c7
2 files changed, 11 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 937b5c7c4c4..74fd2bc35b7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12013-12-18 Eli Zaretskii <eliz@gnu.org>
2
3 * w32fns.c (emacs_abort): Use intptr_t as argument of
4 INT_BUFSIZE_BOUND, to avoid compiler warnings.
5
12013-12-18 Glenn Morris <rgm@gnu.org> 62013-12-18 Glenn Morris <rgm@gnu.org>
2 7
3 * lread.c (Fload): Pass load_prefer_newer to openp. 8 * lread.c (Fload): Pass load_prefer_newer to openp.
diff --git a/src/w32fns.c b/src/w32fns.c
index 8576d478e42..73197c6a8f2 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -8422,7 +8422,12 @@ emacs_abort (void)
8422 int errfile_fd = -1; 8422 int errfile_fd = -1;
8423 int j; 8423 int j;
8424 char buf[sizeof ("\r\nException at this address:\r\n\r\n") 8424 char buf[sizeof ("\r\nException at this address:\r\n\r\n")
8425 + 2 * INT_BUFSIZE_BOUND (void *)]; 8425 /* The type below should really be 'void *', but
8426 INT_BUFSIZE_BOUND cannot handle that without
8427 triggering compiler warnings (under certain
8428 pedantic warning switches), it wants an
8429 integer type. */
8430 + 2 * INT_BUFSIZE_BOUND (intptr_t)];
8426#ifdef CYGWIN 8431#ifdef CYGWIN
8427 int stderr_fd = 2; 8432 int stderr_fd = 2;
8428#else 8433#else