Merge pull request #2260 from xmcclure/fix-testwaitany

[mono.git] / mcs / class / Mono.Posix / Mono.Unix / UnixSignal.cs

diff --git a/mcs/class/Mono.Posix/Mono.Unix/UnixSignal.cs b/mcs/class/Mono.Posix/Mono.Unix/UnixSignal.cs
index fe1f8beba8ea990d0c570bccd30064a06dcc9c86..8e4eb5b84639c63cc417ce8b43634c484e3c7d2e 100644 (file)
--- a/mcs/class/Mono.Posix/Mono.Unix/UnixSignal.cs
+++ b/mcs/class/Mono.Posix/Mono.Unix/UnixSignal.cs
@@ -150,10 +150,12 @@ namespace Mono.Unix {
                        set {Interlocked.Exchange (ref Info->count, value);}
                }
 
+               // signum, count, write_fd, pipecnt, and pipelock are read from a signal handler thread
+               // count and pipelock are both read and written from the signal handler thread
                [Map]
                struct SignalInfo {
-                       public int signum, count, read_fd, write_fd, have_handler, pipecnt;
-                       public IntPtr handler;
+                       public int signum, count, read_fd, write_fd, pipecnt, pipelock, have_handler;
+                       public IntPtr handler; // Backed-up handler to restore when signal unregistered
                }
 
                #region WaitHandle overrides