diff options
| author | Eli Zaretskii | 2012-10-05 13:19:58 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2012-10-05 13:19:58 +0200 |
| commit | a65fbb5f0ef0e6929393750ec466f11cefc6ba60 (patch) | |
| tree | 8fdc31b5851299fabd34a52c9c10d8e893003960 | |
| parent | 0ace05d38a4dfcb5a468adaf8c8d5a6185a9eca2 (diff) | |
| download | emacs-a65fbb5f0ef0e6929393750ec466f11cefc6ba60.tar.gz emacs-a65fbb5f0ef0e6929393750ec466f11cefc6ba60.zip | |
Fix a typo in a w32proc.c declaration.
src/w32proc.c (stop_timer_thread): Fix declaration of 'err'.
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/w32proc.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b2502010619..cb17e8192e4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2012-10-05 Eli Zaretskii <eliz@gnu.org> | 1 | 2012-10-05 Eli Zaretskii <eliz@gnu.org> |
| 2 | 2 | ||
| 3 | * w32proc.c (stop_timer_thread): Fix declaration of 'err'. | ||
| 4 | |||
| 3 | * w32.c (utime): Open the file with FILE_FLAG_BACKUP_SEMANTICS, so | 5 | * w32.c (utime): Open the file with FILE_FLAG_BACKUP_SEMANTICS, so |
| 4 | that time stamps of directories could also be changed. Don't | 6 | that time stamps of directories could also be changed. Don't |
| 5 | request the too broad GENERIC_WRITE, only the more restrictive | 7 | request the too broad GENERIC_WRITE, only the more restrictive |
diff --git a/src/w32proc.c b/src/w32proc.c index 56a60fbf25f..d032b21c59e 100644 --- a/src/w32proc.c +++ b/src/w32proc.c | |||
| @@ -404,8 +404,8 @@ stop_timer_thread (int which) | |||
| 404 | struct itimer_data *itimer = | 404 | struct itimer_data *itimer = |
| 405 | (which == ITIMER_REAL) ? &real_itimer : &prof_itimer; | 405 | (which == ITIMER_REAL) ? &real_itimer : &prof_itimer; |
| 406 | int i; | 406 | int i; |
| 407 | DWORD exit_code = 255; | 407 | DWORD err, exit_code = 255; |
| 408 | BOOL status, err; | 408 | BOOL status; |
| 409 | 409 | ||
| 410 | /* Signal the thread that it should terminate. */ | 410 | /* Signal the thread that it should terminate. */ |
| 411 | itimer->terminate = 1; | 411 | itimer->terminate = 1; |