diff options
| author | Fabrice Popineau | 2012-12-08 14:11:29 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2012-12-08 14:11:29 +0200 |
| commit | c56efa40745336c8067f047fe8f736821ddb3791 (patch) | |
| tree | d1468d2e8e5d4ceb6db18d7ff11080357a0090b0 /src | |
| parent | 75ceee05671c1698e27e5188487e7e74c490f201 (diff) | |
| download | emacs-c56efa40745336c8067f047fe8f736821ddb3791.tar.gz emacs-c56efa40745336c8067f047fe8f736821ddb3791.zip | |
w32fns.c (emacs_abort): Don't do arithmetics on void pointers.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/w32fns.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 3e8b8519ba3..54985d33b59 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-12-08 Fabrice Popineau <fabrice.popineau@gmail.com> | ||
| 2 | |||
| 3 | * w32fns.c (emacs_abort): Don't do arithmetics on void pointers. | ||
| 4 | |||
| 1 | 2012-12-08 Eli Zaretskii <eliz@gnu.org> | 5 | 2012-12-08 Eli Zaretskii <eliz@gnu.org> |
| 2 | 6 | ||
| 3 | * w32.c (unsetenv, sys_putenv): New functions. | 7 | * w32.c (unsetenv, sys_putenv): New functions. |
diff --git a/src/w32fns.c b/src/w32fns.c index 6801fc68054..1a181079c82 100644 --- a/src/w32fns.c +++ b/src/w32fns.c | |||
| @@ -7784,7 +7784,7 @@ emacs_abort (void) | |||
| 7784 | /* stack[] gives the return addresses, whereas we want | 7784 | /* stack[] gives the return addresses, whereas we want |
| 7785 | the address of the call, so decrease each address | 7785 | the address of the call, so decrease each address |
| 7786 | by approximate size of 1 CALL instruction. */ | 7786 | by approximate size of 1 CALL instruction. */ |
| 7787 | sprintf (buf, "0x%p\r\n", stack[j] - sizeof(void *)); | 7787 | sprintf (buf, "0x%p\r\n", (char *)stack[j] - sizeof(void *)); |
| 7788 | if (stderr_fd >= 0) | 7788 | if (stderr_fd >= 0) |
| 7789 | write (stderr_fd, buf, strlen (buf)); | 7789 | write (stderr_fd, buf, strlen (buf)); |
| 7790 | if (errfile_fd >= 0) | 7790 | if (errfile_fd >= 0) |