Merge working tree with build tree.

[m6w6/libmemcached] / libtest / signal.h

diff --git a/libtest/signal.h b/libtest/signal.h
index 5cc823acc325aa2577625c742d399fd93e25083d..f54633c767e952872f261ead089d8fc15a1051fd 100644 (file)
--- a/libtest/signal.h
+++ b/libtest/signal.h
@@ -25,6 +25,7 @@
 
 #include <pthread.h>
 #include <semaphore.h>
+#include <signal.h>
 
 enum shutdown_t {
   SHUTDOWN_RUNNING,
@@ -41,10 +42,12 @@ class SignalThread {
   volatile shutdown_t __shutdown;
   pthread_mutex_t shutdown_mutex;
   pthread_t thread;
+  sigset_t original_set;
 
 public:
 
   SignalThread();
+  ~SignalThread();
 
   void test();
   void post();
@@ -55,8 +58,6 @@ public:
     return sigwait(&set, &sig);
   }
 
-  ~SignalThread();
-
   void set_shutdown(shutdown_t arg);
   bool is_shutdown();
   shutdown_t get_shutdown();