Fedora 4 patch - gcc4 fixes

diff --git a/src/control/control.c b/src/control/control.c
index be9bd8b638af3fc25967868d836943324982e218..ea16a475778004cdadb16512b729165d88d24224 100644 (file)
--- a/src/control/control.c
+++ b/src/control/control.c
@@ -560,7 +560,7 @@ int snd_ctl_get_power_state(snd_ctl_t *ctl, unsigned int *state)
 int snd_ctl_read(snd_ctl_t *ctl, snd_ctl_event_t *event)
 {
        assert(ctl && event);
-       return ctl->ops->read(ctl, event);
+       return (ctl->ops->read)(ctl, event);
 }
 
 /**

diff --git a/src/hwdep/hwdep.c b/src/hwdep/hwdep.c
index 43d96265a995d91fe198b53fcd774cb435f1b316..f93c882194dd40bdf45cea493d999714efb178d5 100644 (file)
--- a/src/hwdep/hwdep.c
+++ b/src/hwdep/hwdep.c
@@ -485,7 +485,7 @@ ssize_t snd_hwdep_read(snd_hwdep_t *hwdep, void *buffer, size_t size)
        assert(hwdep);
        assert(((hwdep->mode & O_ACCMODE) == O_RDONLY) || ((hwdep->mode & O_ACCMODE) == O_RDWR));
        assert(buffer || size == 0);
-       return hwdep->ops->read(hwdep, buffer, size);
+       return (hwdep->ops->read)(hwdep, buffer, size);
 }
 
 /**

diff --git a/src/pcm/pcm_dmix_generic.c b/src/pcm/pcm_dmix_generic.c
index dfd327fb5736ed417412567c6597c9f4de32b9e7..2bb39686e9cfe2907b875521c800df975582c629 100644 (file)
--- a/src/pcm/pcm_dmix_generic.c
+++ b/src/pcm/pcm_dmix_generic.c
@@ -75,9 +75,9 @@ static void mix_areas1(unsigned int size,
                } while (IS_CONCURRENT && *sum != old_sample);
                if (!--size)
                        return;
-               src += src_step;
-               dst += dst_step;
-               sum += sum_step;
+               src = (signed short *) ((char *)src + src_step);
+               dst = (signed short *) ((char *)dst + dst_step);
+               sum = (signed int *)   ((char *)sum + sum_step);
        }
 }
 
@@ -109,9 +109,9 @@ static void mix_areas2(unsigned int size,
                } while (IS_CONCURRENT && *sum != old_sample);
                if (!--size)
                        return;
-               src += src_step;
-               dst += dst_step;
-               sum += sum_step;
+               src = (signed int *) ((char *)src + src_step);
+               dst = (signed int *) ((char *)dst + dst_step);
+               sum = (signed int *) ((char *)sum + sum_step);
        }
 }
 

diff --git a/src/pcm/pcm_plugin.c b/src/pcm/pcm_plugin.c
index 68dd4d460c963e51dbb3f538d3393916544d4d96..caca2e1996db139cb7a779f6a3144142e250a70d 100644 (file)
--- a/src/pcm/pcm_plugin.c
+++ b/src/pcm/pcm_plugin.c
@@ -316,7 +316,7 @@ static snd_pcm_sframes_t snd_pcm_plugin_read_areas(snd_pcm_t *pcm,
                snd_pcm_mmap_begin(slave, &slave_areas, &slave_offset, &slave_frames);
                if (slave_frames == 0)
                        break;
-               frames = plugin->read(pcm, areas, offset, frames,
+               frames = (plugin->read)(pcm, areas, offset, frames,
                                      slave_areas, slave_offset, &slave_frames);
                if (CHECK_SANITY(slave_frames > snd_pcm_mmap_capture_avail(slave))) {
                        SNDMSG("read overflow %ld > %ld", slave_frames,
@@ -488,7 +488,7 @@ snd_pcm_sframes_t snd_pcm_plugin_avail_update(snd_pcm_t *pcm)
                                return xfer > 0 ? (snd_pcm_sframes_t)xfer : err;
                        if (frames > cont)
                                frames = cont;
-                       frames = plugin->read(pcm, areas, hw_offset, frames,
+                       frames = (plugin->read)(pcm, areas, hw_offset, frames,
                                              slave_areas, slave_offset, &slave_frames);
                        snd_atomic_write_begin(&plugin->watom);
                        snd_pcm_mmap_hw_forward(pcm, frames);

diff --git a/src/rawmidi/rawmidi.c b/src/rawmidi/rawmidi.c
index 925e1ed8a6a8676dad9e7bcb616c8e8579923550..491c7e9564c4d3afde6ad39993f4d43f4a57ae71 100644 (file)
--- a/src/rawmidi/rawmidi.c
+++ b/src/rawmidi/rawmidi.c
@@ -987,5 +987,5 @@ ssize_t snd_rawmidi_read(snd_rawmidi_t *rawmidi, void *buffer, size_t size)
        assert(rawmidi);
        assert(rawmidi->stream == SND_RAWMIDI_STREAM_INPUT);
        assert(buffer || size == 0);
-       return rawmidi->ops->read(rawmidi, buffer, size);
+       return (rawmidi->ops->read)(rawmidi, buffer, size);
 }

diff --git a/src/seq/seq.c b/src/seq/seq.c
index ebcec311474fcaa01e0da291f2e1241a157d27df..0b56a702673342ffaf53d2d9903042df7d28a067 100644 (file)
--- a/src/seq/seq.c
+++ b/src/seq/seq.c
@@ -3912,7 +3912,7 @@ int snd_seq_extract_output(snd_seq_t *seq, snd_seq_event_t **ev_res)
 static ssize_t snd_seq_event_read_buffer(snd_seq_t *seq)
 {
        ssize_t len;
-       len = seq->ops->read(seq, seq->ibuf, seq->ibufsize * sizeof(snd_seq_event_t));
+       len = (seq->ops->read)(seq, seq->ibuf, seq->ibufsize * sizeof(snd_seq_event_t));
        if (len < 0)
                return len;
        seq->ibuflen = len / sizeof(snd_seq_event_t);

diff --git a/src/timer/timer.c b/src/timer/timer.c
index 5bd86cd2bacf3501a4f76d7d81b888b5efe0b0c3..bb6125a2ff18bff3633493efc56e7b26c3f67bde 100644 (file)
--- a/src/timer/timer.c
+++ b/src/timer/timer.c
@@ -876,7 +876,7 @@ ssize_t snd_timer_read(snd_timer_t *timer, void *buffer, size_t size)
        assert(timer);
        assert(((timer->mode & O_ACCMODE) == O_RDONLY) || ((timer->mode & O_ACCMODE) == O_RDWR));
        assert(buffer || size == 0);
-       return timer->ops->read(timer, buffer, size);
+       return (timer->ops->read)(timer, buffer, size);
 }
 
 /**