From 3fc91be72b28ee5aba8407487e8fbfad60fcc909 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Sun, 25 Dec 2011 04:05:31 +0000 Subject: [PATCH] * fhandler_dsp.cc (fhandler_dev_dsp::fhandler_dev_dsp): Set up device. * syscalls.cc (open): Very minor formatting tweak. --- winsup/cygwin/ChangeLog | 6 ++++++ winsup/cygwin/fhandler_dsp.cc | 2 +- winsup/cygwin/syscalls.cc | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 2686bda5b..0f1d925a0 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,9 @@ +2011-12-24 Christopher Faylor + + * fhandler_dsp.cc (fhandler_dev_dsp::fhandler_dev_dsp): Set up device. + + * syscalls.cc (open): Very minor formatting tweak. + 2011-12-24 Corinna Vinschen * path.cc (struct symlink_info): Add bool argument to declaration of diff --git a/winsup/cygwin/fhandler_dsp.cc b/winsup/cygwin/fhandler_dsp.cc index 4d7ddcd2a..de2169eed 100644 --- a/winsup/cygwin/fhandler_dsp.cc +++ b/winsup/cygwin/fhandler_dsp.cc @@ -994,9 +994,9 @@ waveIn_callback (HWAVEIN hWave, UINT msg, DWORD instance, DWORD param1, fhandler_dev_dsp::fhandler_dev_dsp (): fhandler_base () { - debug_printf ("0x%08x", (int)this); audio_in_ = NULL; audio_out_ = NULL; + dev ().parse (FH_OSS_DSP); } int diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc index 6d46dd7a4..3d67e637f 100644 --- a/winsup/cygwin/syscalls.cc +++ b/winsup/cygwin/syscalls.cc @@ -1275,7 +1275,7 @@ open (const char *unix_path, int flags, ...) tty for the process. */ int opt = PC_OPEN | ((flags & (O_NOFOLLOW | O_EXCL)) ? PC_SYM_NOFOLLOW : PC_SYM_FOLLOW); - if (!(flags & O_NOCTTY)&& fd > 2) + if (!(flags & O_NOCTTY) && fd > 2) { flags |= O_NOCTTY; opt |= PC_CTTY; /* flag that, if opened, this fhandler could