diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-15 00:48:51 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 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 | |
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/>. */ /* Symbols. */ -Lisp_Object QCvolume, QCdevice; -Lisp_Object Qsound; -Lisp_Object Qplay_sound_functions; +static Lisp_Object QCvolume, QCdevice; +static Lisp_Object Qsound; +static Lisp_Object Qplay_sound_functions; /* Indices of attributes in a sound attributes vector. */ @@ -281,8 +281,8 @@ struct sound /* These are set during `play-sound-internal' so that sound_cleanup has access to them. */ -struct sound_device *current_sound_device; -struct sound *current_sound; +static struct sound_device *current_sound_device; +static struct sound *current_sound; /* Function prototypes. */ |