diff --git a/src/ia64/Gglobal.c b/src/ia64/Gglobal.c
index 65711cad..9525f8c2 100644
--- a/src/ia64/Gglobal.c
+++ b/src/ia64/Gglobal.c
@@ -1,5 +1,5 @@
 /* libunwind - a platform-independent unwind library
-   Copyright (C) 2002-2004 Hewlett-Packard Co
+   Copyright (C) 2002-2005 Hewlett-Packard Co
 	Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
 
 This file is part of libunwind.
@@ -65,13 +65,13 @@ tdep_init (void)
     0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x3e,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
   };
-  sigset_t saved_sigmask;
+  intrmask_t saved_mask;
   uint8_t *lep, *bep;
   long i;
 
-  sigfillset (&unwi_full_sigmask);
+  sigfillset (&unwi_full_mask);
 
-  sigprocmask (SIG_SETMASK, &unwi_full_sigmask, &saved_sigmask);
+  sigprocmask (SIG_SETMASK, &unwi_full_mask, &saved_mask);
   mutex_lock (&unw.lock);
   {
     if (!tdep_needs_initialization)
@@ -121,5 +121,5 @@ tdep_init (void)
   }
  out:
   mutex_unlock (&unw.lock);
-  sigprocmask (SIG_SETMASK, &saved_sigmask, NULL);
+  sigprocmask (SIG_SETMASK, &saved_mask, NULL);
 }
diff --git a/src/mi/init.c b/src/mi/init.c
index afd97808..9d9e6019 100644
--- a/src/mi/init.c
+++ b/src/mi/init.c
@@ -1,5 +1,5 @@
 /* libunwind - a platform-independent unwind library
-   Copyright (C) 2002-2004 Hewlett-Packard Co
+   Copyright (C) 2002-2005 Hewlett-Packard Co
 	Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
 
 This file is part of libunwind.
@@ -29,7 +29,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 #include "internal.h"
 #include "tdep.h"
 
-HIDDEN sigset_t unwi_full_sigmask;
+HIDDEN intrmask_t unwi_full_mask;
 
 static const char rcsid[] UNUSED =
   "$Id: " PACKAGE_STRING " --- report bugs to " PACKAGE_BUGREPORT " $";
diff --git a/src/x86/Gglobal.c b/src/x86/Gglobal.c
index 126b38de..e55644c9 100644
--- a/src/x86/Gglobal.c
+++ b/src/x86/Gglobal.c
@@ -1,5 +1,5 @@
 /* libunwind - a platform-independent unwind library
-   Copyright (c) 2003 Hewlett-Packard Development Company, L.P.
+   Copyright (c) 2003, 2005 Hewlett-Packard Development Company, L.P.
 	Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
 
 This file is part of libunwind.
@@ -43,11 +43,11 @@ HIDDEN uint8_t dwarf_to_unw_regnum_map[19] =
 HIDDEN void
 tdep_init (void)
 {
-  sigset_t saved_sigmask;
+  intrmask_t saved_mask;
 
-  sigfillset (&unwi_full_sigmask);
+  sigfillset (&unwi_full_mask);
 
-  sigprocmask (SIG_SETMASK, &unwi_full_sigmask, &saved_sigmask);
+  sigprocmask (SIG_SETMASK, &unwi_full_mask, &saved_mask);
   mutex_lock (&x86_lock);
   {
     if (!tdep_needs_initialization)
@@ -65,5 +65,5 @@ tdep_init (void)
   }
  out:
   mutex_unlock (&x86_lock);
-  sigprocmask (SIG_SETMASK, &saved_sigmask, NULL);
+  sigprocmask (SIG_SETMASK, &saved_mask, NULL);
 }
diff --git a/src/x86_64/Gglobal.c b/src/x86_64/Gglobal.c
index a0ca9932..ec14efe1 100644
--- a/src/x86_64/Gglobal.c
+++ b/src/x86_64/Gglobal.c
@@ -1,5 +1,5 @@
 /* libunwind - a platform-independent unwind library
-   Copyright (c) 2003 Hewlett-Packard Development Company, L.P.
+   Copyright (c) 2003, 2005 Hewlett-Packard Development Company, L.P.
 	Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
 
    Modified for x86_64 by Max Asbock <masbock@us.ibm.com>
@@ -57,11 +57,11 @@ HIDDEN uint8_t dwarf_to_unw_regnum_map[17] =
 HIDDEN void
 tdep_init (void)
 {
-  sigset_t saved_sigmask;
+  intrmask_t saved_mask;
 
-  sigfillset (&unwi_full_sigmask);
+  sigfillset (&unwi_full_mask);
 
-  sigprocmask (SIG_SETMASK, &unwi_full_sigmask, &saved_sigmask);
+  sigprocmask (SIG_SETMASK, &unwi_full_mask, &saved_mask);
   mutex_lock (&x86_64_lock);
   {
     if (!tdep_needs_initialization)
@@ -79,5 +79,5 @@ tdep_init (void)
   }
  out:
   mutex_unlock (&x86_64_lock);
-  sigprocmask (SIG_SETMASK, &saved_sigmask, NULL);
+  sigprocmask (SIG_SETMASK, &saved_mask, NULL);
 }