← Back to branch summary

~ubuntu-branches/ubuntu/maverick/xorg-server/maverick

« back to all changes in this revision

Viewing changes to hw/xfree86/os-support/solaris/sun_bell.c

  • Committer: Bazaar Package Importer
  • Author(s): Bryce Harrington, Timo Aaltonen, Bryce Harrington
  • Date: 2010-03-24 12:04:20 UTC
  • mfrom: (1.1.32 upstream) (0.11.4 sid)
  • Revision ID: james.westby@ubuntu.com-20100324120420-qbk5la526uy4k8xe
Tags: 2:1.7.6-1ubuntu1
https://launchpad.net/bugs/401045
[Timo Aaltonen]
* Merge from Debian unstable.
* Drop patch 107, included in Debian.
* Drop patch 108, included upstream.
* control: Drop the udeb, we don't need it for lucid.
* control: Relax/drop some build-deps caused by the udeb.

[Bryce Harrington]
* Add 110_findglyphbyhash-fix.patch from upstream to fix a sporadic
  crash in FindGlyphByHash.
  (LP: #401045)
* Renumber patch 201_armel-drv-fallbacks.patch to 111

Show diffs side-by-side

added added

removed removed

Lines of Context:
hw/xfree86/os-support/solaris/sun_bell.c
126
126
    iovcnt = 0;
127
127
 
128
128
    for (cnt = 0; cnt <= repeats; cnt++) {
129
 
        iov[iovcnt].iov_base = (char *) samples;
130
 
        iov[iovcnt++].iov_len = sizeof(samples);
131
129
        if (cnt == repeats) {
132
130
            /* Insert a bit of silence so that multiple beeps are distinct and
133
131
             * not compressed into a single tone.
134
132
             */
135
133
            iov[iovcnt].iov_base = (char *) silence;
136
134
            iov[iovcnt++].iov_len = sizeof(silence);
 
135
        } else {
 
136
            iov[iovcnt].iov_base = (char *) samples;
 
137
            iov[iovcnt++].iov_len = sizeof(samples);
137
138
        }
138
139
        if ((iovcnt >= IOV_MAX) || (cnt == repeats)) {
139
140
            written = writev(audioFD, iov, iovcnt);