diff options
| author | Paul Eggert | 2011-04-26 11:02:10 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-26 11:02:10 -0700 |
| commit | 69e9b5a37cf64ead4e10688063eef705744332bb (patch) | |
| tree | d88d4fbfed1ac04c06c2c5c8afebc956f7962f5c /src | |
| parent | b5f869a7d838121b17493ad66958309c0d6031e5 (diff) | |
| download | emacs-69e9b5a37cf64ead4e10688063eef705744332bb.tar.gz emacs-69e9b5a37cf64ead4e10688063eef705744332bb.zip | |
* keyboard.c (handle_user_signal): Fix pointer signedness problem.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/keyboard.c | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c6bb161ec84..5c04f32b194 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2011-04-26 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-04-26 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * keyboard.c (handle_user_signal): Fix pointer signedness problem. | ||
| 4 | |||
| 3 | * gnutls.c (emacs_gnutls_handle_error): Remove unused local. | 5 | * gnutls.c (emacs_gnutls_handle_error): Remove unused local. |
| 4 | (Fgnutls_boot): gnutls_certificate_verify_peers2 wants unsigned *. | 6 | (Fgnutls_boot): gnutls_certificate_verify_peers2 wants unsigned *. |
| 5 | Remove unused local. | 7 | Remove unused local. |
diff --git a/src/keyboard.c b/src/keyboard.c index 6236c42e976..fac098ddffd 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -7228,13 +7228,13 @@ handle_user_signal (int sig) | |||
| 7228 | { | 7228 | { |
| 7229 | int old_errno = errno; | 7229 | int old_errno = errno; |
| 7230 | struct user_signal_info *p; | 7230 | struct user_signal_info *p; |
| 7231 | const char* special_event_name = NULL; | 7231 | const char *special_event_name = NULL; |
| 7232 | 7232 | ||
| 7233 | SIGNAL_THREAD_CHECK (sig); | 7233 | SIGNAL_THREAD_CHECK (sig); |
| 7234 | 7234 | ||
| 7235 | if (SYMBOLP (Vdebug_on_event)) | 7235 | if (SYMBOLP (Vdebug_on_event)) |
| 7236 | special_event_name = SDATA (SYMBOL_NAME (Vdebug_on_event)); | 7236 | special_event_name = SSDATA (SYMBOL_NAME (Vdebug_on_event)); |
| 7237 | 7237 | ||
| 7238 | for (p = user_signals; p; p = p->next) | 7238 | for (p = user_signals; p; p = p->next) |
| 7239 | if (p->sig == sig) | 7239 | if (p->sig == sig) |
| 7240 | { | 7240 | { |
| @@ -7250,7 +7250,7 @@ handle_user_signal (int sig) | |||
| 7250 | /* Eat the event. */ | 7250 | /* Eat the event. */ |
| 7251 | break; | 7251 | break; |
| 7252 | } | 7252 | } |
| 7253 | 7253 | ||
| 7254 | p->npending++; | 7254 | p->npending++; |
| 7255 | #ifdef SIGIO | 7255 | #ifdef SIGIO |
| 7256 | if (interrupt_input) | 7256 | if (interrupt_input) |