diff options
author | Christopher Faylor <me@cgf.cx> | 2006-07-17 19:30:30 +0000 |
---|---|---|
committer | Christopher Faylor <me@cgf.cx> | 2006-07-17 19:30:30 +0000 |
commit | f62412f235c387d46e192244db43ce62d9a9e7be (patch) | |
tree | d73718103abbf20830156b3b28ffb827ac31f99a /winsup/cygwin/fhandler_fifo.cc | |
parent | b04b2e6b6d8edee67190de6ffc5abd8b56916ffa (diff) | |
download | cygnal-f62412f235c387d46e192244db43ce62d9a9e7be.tar.gz cygnal-f62412f235c387d46e192244db43ce62d9a9e7be.tar.bz2 cygnal-f62412f235c387d46e192244db43ce62d9a9e7be.zip |
GCC 4.1 fixes.
* cygheap.h (cygheap_user): Remove unneeded class names from function
declaration.
* fhandler.h (fhandler_base): Ditto.
(fhandler_dev_floppy): Ditto.
(fhandler_console): Ditto.
* wininfo.h (wininfo): Ditto.
* exceptions.cc (sigpacket::process): Avoid compiler errors about gotos and
initialization.
* fhandler_fifo.cc (fhandler_fifo::open): Ditto.
* fhandler_floppy.cc (fhandler_dev_floppy::ioctl): Ditto.
* fhandler_tty.cc (fhandler_tty_slave::ioctl): Ditto.
* mmap.cc (mmap64): Ditto.
* pipe.cc (fhandler_pipe::open): Ditto.
* spawn.cc (spawn_guts): Ditto.
* sec_helper.cc: Fix some comments.
(get_null_sd): Move file-scope static to only function where it is used.
Diffstat (limited to 'winsup/cygwin/fhandler_fifo.cc')
-rw-r--r-- | winsup/cygwin/fhandler_fifo.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/winsup/cygwin/fhandler_fifo.cc b/winsup/cygwin/fhandler_fifo.cc index 8f1a58477..aa631528a 100644 --- a/winsup/cygwin/fhandler_fifo.cc +++ b/winsup/cygwin/fhandler_fifo.cc @@ -150,6 +150,7 @@ fhandler_fifo::open (int flags, mode_t) char mutex[CYG_MAX_PATH]; char *emutex = mutex + CYG_MAX_PATH; char *p, *p1; + DWORD resw; /* Generate a semi-unique name to associate with this fifo but try to ensure that it is no larger than CYG_MAX_PATH */ @@ -175,7 +176,7 @@ fhandler_fifo::open (int flags, mode_t) open an fd. */ /* FIXME? Need to wait for signal here? This shouldn't block for long, but... */ - DWORD resw = WaitForSingleObject (h, INFINITE); + resw = WaitForSingleObject (h, INFINITE); lock_process::locker.acquire (); /* Restore the lock */ if (resw != WAIT_OBJECT_0 && resw != WAIT_ABANDONED_0) { |