summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--winsup/cygwin/ChangeLog7
-rw-r--r--winsup/cygwin/fhandler_dsp.cc4
2 files changed, 8 insertions, 3 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index e4038c78d..c61777cc8 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,10 +1,15 @@
2014-03-19 Christopher Faylor <me.cygwin2014@cgf.cx>
+ * fhandler_dsp.cc (fhandler_dev_dsp::ioctl): Actually pass ioctl
+ argument to _ioctl.
+
+2014-03-19 Christopher Faylor <me.cygwin2014@cgf.cx>
+
* fhandler.h (fhandler_dev_dsp): Remove variable names from
declarations.
(fhandler_dev_dsp::close_audio_in): Make __reg1.
(fhandler_dev_dsp::close_audio_out): Make __reg2.
- * fhandler_dev_dsp.cc (fhandler_dev_dsp::close_audio_in): Make __reg1.
+ * fhandler_dsp.cc (fhandler_dev_dsp::close_audio_in): Make __reg1.
(fhandler_dev_dsp::close_audio_out): Make __reg2.
(fhandler_dev_dsp::close): Don't abruptly terminate sound just because
we are exiting.
diff --git a/winsup/cygwin/fhandler_dsp.cc b/winsup/cygwin/fhandler_dsp.cc
index 2f5019b2c..af6c2ea07 100644
--- a/winsup/cygwin/fhandler_dsp.cc
+++ b/winsup/cygwin/fhandler_dsp.cc
@@ -1018,9 +1018,9 @@ fhandler_dev_dsp::read (void *ptr, size_t& len)
}
int
-fhandler_dev_dsp::ioctl (unsigned int cmd, void *)
+fhandler_dev_dsp::ioctl (unsigned int cmd, void *buf)
{
- return base ()->_ioctl (cmd, NULL);
+ return base ()->_ioctl (cmd, buf);
}
void