diff options
| author | Paul Eggert | 2011-04-15 00:48:51 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-15 00:48:51 -0700 |
| commit | 4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9 (patch) | |
| tree | e993b231bb5555c9c961f5d0b20d90ac76f77bbd /src/sound.c | |
| parent | 1963a2e0bb07cc8dee6d27f972f93d9cfd7c6b2d (diff) | |
| parent | 49093f601b69d91126aefd328ee8f6bfeb797407 (diff) | |
| download | emacs-4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9.tar.gz emacs-4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9.zip | |
Merge from mainline.
Diffstat (limited to 'src/sound.c')
| -rw-r--r-- | src/sound.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/sound.c b/src/sound.c index c0741f27ff6..55207ddcf51 100644 --- a/src/sound.c +++ b/src/sound.c | |||
| @@ -94,9 +94,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 94 | 94 | ||
| 95 | /* Symbols. */ | 95 | /* Symbols. */ |
| 96 | 96 | ||
| 97 | Lisp_Object QCvolume, QCdevice; | 97 | static Lisp_Object QCvolume, QCdevice; |
| 98 | Lisp_Object Qsound; | 98 | static Lisp_Object Qsound; |
| 99 | Lisp_Object Qplay_sound_functions; | 99 | static Lisp_Object Qplay_sound_functions; |
| 100 | 100 | ||
| 101 | /* Indices of attributes in a sound attributes vector. */ | 101 | /* Indices of attributes in a sound attributes vector. */ |
| 102 | 102 | ||
| @@ -281,8 +281,8 @@ struct sound | |||
| 281 | /* These are set during `play-sound-internal' so that sound_cleanup has | 281 | /* These are set during `play-sound-internal' so that sound_cleanup has |
| 282 | access to them. */ | 282 | access to them. */ |
| 283 | 283 | ||
| 284 | struct sound_device *current_sound_device; | 284 | static struct sound_device *current_sound_device; |
| 285 | struct sound *current_sound; | 285 | static struct sound *current_sound; |
| 286 | 286 | ||
| 287 | /* Function prototypes. */ | 287 | /* Function prototypes. */ |
| 288 | 288 | ||