From 63b61cd19ff1ae741a8c3403c1c3fa12bea1c893 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Fri, 4 May 2001 21:02:15 +0000 Subject: Revert much of previous erroneous checkin. Add ChangeLog entry. * pinfo.h: Correctly set __SIGOFFSET. * path.cc (hash_path_name): Avoid calling library functions for simple copying of characters. * shortcut.c: Use WIN32_LEAN_AND_MEAN. * smallprint.c: Ditto. * environ.cc (getwinenv): Minor clarity fix. * localtime.c: No need to include windows.h * string.h: New file. --- winsup/cygwin/sigproc.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'winsup/cygwin/sigproc.cc') diff --git a/winsup/cygwin/sigproc.cc b/winsup/cygwin/sigproc.cc index 0d2c4f7a8..a44e31611 100644 --- a/winsup/cygwin/sigproc.cc +++ b/winsup/cygwin/sigproc.cc @@ -473,7 +473,7 @@ proc_terminate (void) void __stdcall sig_clear (int sig) { - (void) ilockexch (myself->getsigtodo (sig), 0L); + (void) InterlockedExchange (myself->getsigtodo (sig), 0L); return; } @@ -696,7 +696,7 @@ sig_send (_pinfo *p, int sig, DWORD ebp, bool exception) /* Increment the sigtodo array to signify which signal to assert. */ - (void) ilockincr (p->getsigtodo (sig)); + (void) InterlockedIncrement (p->getsigtodo (sig)); /* Notify the process that a signal has arrived. */ @@ -783,7 +783,7 @@ out: void __stdcall sig_set_pending (int sig) { - (void) ilockincr (myself->getsigtodo (sig)); + (void) InterlockedIncrement (myself->getsigtodo (sig)); return; } @@ -1137,7 +1137,7 @@ wait_sig (VOID *) int dispatched_sigchld = 0; for (int sig = -__SIGOFFSET; sig < NSIG; sig++) { - while (ilockdecr (myself->getsigtodo (sig)) >= 0) + while (InterlockedDecrement (myself->getsigtodo (sig)) >= 0) { if (sig == SIGCHLD) saw_sigchld = 1; @@ -1171,14 +1171,14 @@ wait_sig (VOID *) dispatched_sigchld = 1; /* Need to decrement again to offset increment below since we really do want to decrement in this case. */ - ilockdecr (myself->getsigtodo (sig)); + InterlockedDecrement (myself->getsigtodo (sig)); goto nextsig; /* FIXME: shouldn't this allow the loop to continue? */ } } nextsig: /* Decremented too far. */ - if (ilockincr (myself->getsigtodo (sig)) > 0) + if (InterlockedIncrement (myself->getsigtodo (sig)) > 0) saw_pending_signals = 1; } -- cgit v1.2.3