diff options
| author | Jan D | 2010-07-05 11:55:11 +0200 |
|---|---|---|
| committer | Jan D | 2010-07-05 11:55:11 +0200 |
| commit | ff919460978866c8a3be6b16a4bc2e7cee089354 (patch) | |
| tree | 992775a97266adc233cadcce735bd38cdf050705 /src | |
| parent | e4c8d29a32adbde811a109d5e19caa75fd9d042b (diff) | |
| download | emacs-ff919460978866c8a3be6b16a4bc2e7cee089354.tar.gz emacs-ff919460978866c8a3be6b16a4bc2e7cee089354.zip | |
* xterm.c (XTring_bell, XTset_terminal_window): Fix wrong prototype.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/xterm.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 0b23f0c4426..8c95c3c3206 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2010-07-05 Jan Djärv <jan.h.d@swipnet.se> | 1 | 2010-07-05 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 2 | ||
| 3 | * xterm.c (XTring_bell, XTset_terminal_window): Fix wrong prototype. | ||
| 4 | |||
| 3 | * xsmfns.c (SSDATA): New macro. | 5 | * xsmfns.c (SSDATA): New macro. |
| 4 | (smc_save_yourself_CB, x_session_initialize): Use SSDATA for strings | 6 | (smc_save_yourself_CB, x_session_initialize): Use SSDATA for strings |
| 5 | passed to strlen/strcpy/strcat. | 7 | passed to strlen/strcpy/strcat. |
diff --git a/src/xterm.c b/src/xterm.c index da7763ca48c..6d24324cc5a 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -3103,10 +3103,8 @@ XTtoggle_invisible_pointer (FRAME_PTR f, int invisible) | |||
| 3103 | /* Make audible bell. */ | 3103 | /* Make audible bell. */ |
| 3104 | 3104 | ||
| 3105 | void | 3105 | void |
| 3106 | XTring_bell (void) | 3106 | XTring_bell (struct frame *f) |
| 3107 | { | 3107 | { |
| 3108 | struct frame *f = SELECTED_FRAME (); | ||
| 3109 | |||
| 3110 | if (FRAME_X_DISPLAY (f)) | 3108 | if (FRAME_X_DISPLAY (f)) |
| 3111 | { | 3109 | { |
| 3112 | #if defined (HAVE_TIMEVAL) && defined (HAVE_SELECT) | 3110 | #if defined (HAVE_TIMEVAL) && defined (HAVE_SELECT) |
| @@ -3130,7 +3128,7 @@ XTring_bell (void) | |||
| 3130 | that is bounded by calls to x_update_begin and x_update_end. */ | 3128 | that is bounded by calls to x_update_begin and x_update_end. */ |
| 3131 | 3129 | ||
| 3132 | static void | 3130 | static void |
| 3133 | XTset_terminal_window (register int n) | 3131 | XTset_terminal_window (struct frame *f, int n) |
| 3134 | { | 3132 | { |
| 3135 | /* This function intentionally left blank. */ | 3133 | /* This function intentionally left blank. */ |
| 3136 | } | 3134 | } |