diff options
| -rw-r--r-- | winsup/cygwin/ChangeLog | 7 | ||||
| -rw-r--r-- | winsup/cygwin/miscfuncs.cc | 14 | ||||
| -rw-r--r-- | winsup/cygwin/miscfuncs.h | 1 | ||||
| -rw-r--r-- | winsup/cygwin/pipe.cc | 1 |
4 files changed, 7 insertions, 16 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 9c6ece819..759d0c880 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,10 @@ +2011-08-12 Christopher Faylor <me.cygwin2011@cgf.cx> + + * miscfuncs.cc (create_pipe): Delete obsolete function. + * miscfuncs.h (create_pipe): Delete define. + + * pipe.c (fhandler_pipe::create_selectable): Delete obsolete comment. + 2011-08-12 Corinna Vinschen <corinna@vinschen.de> * fhandler_proc.cc (fhandler_proc::closedir): Don't free, but delete diff --git a/winsup/cygwin/miscfuncs.cc b/winsup/cygwin/miscfuncs.cc index 14d67789f..42880c12c 100644 --- a/winsup/cygwin/miscfuncs.cc +++ b/winsup/cygwin/miscfuncs.cc @@ -332,20 +332,6 @@ nice_to_winprio (int &nice) return prio; } -#undef CreatePipe -bool -create_pipe (PHANDLE hr,PHANDLE hw, LPSECURITY_ATTRIBUTES sa, DWORD n) -{ - for (int i = 0; i < 10; i++) - if (CreatePipe (hr, hw, sa, n)) - return true; - else if (GetLastError () == ERROR_PIPE_BUSY && i < 9) - Sleep (10); - else - break; - return false; -} - /* backslashify: Convert all forward slashes in src path to back slashes in dst path. Add a trailing slash to dst when trailing_slash_p arg is set to 1. */ diff --git a/winsup/cygwin/miscfuncs.h b/winsup/cygwin/miscfuncs.h index 6be70e343..0cff6c2b2 100644 --- a/winsup/cygwin/miscfuncs.h +++ b/winsup/cygwin/miscfuncs.h @@ -16,7 +16,6 @@ DWORD nice_to_winprio (int &) __attribute__ ((regparm (1))); bool __stdcall create_pipe (PHANDLE, PHANDLE, LPSECURITY_ATTRIBUTES, DWORD) __attribute__ ((regparm (3))); -#define CreatePipe create_pipe extern "C" void yield (); diff --git a/winsup/cygwin/pipe.cc b/winsup/cygwin/pipe.cc index 1050f3242..87f79bda2 100644 --- a/winsup/cygwin/pipe.cc +++ b/winsup/cygwin/pipe.cc @@ -243,7 +243,6 @@ fhandler_pipe::create_selectable (LPSECURITY_ATTRIBUTES sa_ptr, HANDLE& r, PIPE_TYPE_BYTE | PIPE_READMODE_BYTE, 1, psize, psize, NMPWAIT_USE_DEFAULT_WAIT, sa_ptr); - /* Win 95 seems to return NULL instead of INVALID_HANDLE_VALUE */ if (r != INVALID_HANDLE_VALUE) { debug_printf ("pipe read handle %p", r); |