diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-14 13:16:48 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-14 13:16:48 -0700 |
| commit | 8bd7b8304a41da5dc0c8a11967c1a6005e9465d0 (patch) | |
| tree | 145588110166df723c31f3fceaa00c190b77aa8c /src/sound.c | |
| parent | cd64ea1d0df393beb93d1bdf19bd3990e3378f85 (diff) | |
| parent | 9024ff7943e9529ec38a80aaaa0db43224c1e885 (diff) | |
| download | emacs-8bd7b8304a41da5dc0c8a11967c1a6005e9465d0.tar.gz | |
Merge from mainline.
Diffstat (limited to 'src/sound.c')
| -rw-r--r-- | src/sound.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/sound.c b/src/sound.c index e121b5e37f3..697e81c814b 100644 --- a/src/sound.c +++ b/src/sound.c @@ -460,8 +460,8 @@ sound_cleanup (Lisp_Object arg) current_sound_device->close (current_sound_device); if (current_sound->fd > 0) emacs_close (current_sound->fd); - free (current_sound_device); - free (current_sound); + xfree (current_sound_device); + xfree (current_sound); return Qnil; } @@ -897,7 +897,7 @@ vox_init (struct sound_device *sd) static void vox_write (struct sound_device *sd, const char *buffer, int nbytes) { - int nwritten = emacs_write (sd->fd, buffer, nbytes); + ssize_t nwritten = emacs_write (sd->fd, buffer, nbytes); if (nwritten < 0) sound_perror ("Error writing to sound device"); } @@ -1095,7 +1095,7 @@ alsa_close (struct sound_device *sd) snd_pcm_drain (p->handle); snd_pcm_close (p->handle); } - free (p); + xfree (p); } } |