diff -ur libunwind/src/mi/mempool.c libunwind-mod/src/mi/mempool.c
--- libunwind/src/mi/mempool.c	2005-03-04 14:26:18.452083648 -0600
+++ libunwind-mod/src/mi/mempool.c	2005-03-04 14:24:38.119336544 -0600
@@ -40,6 +40,8 @@
 static char *sos_memp;
 static size_t pg_size;
 
+static define_lock(soslock);
+
 HIDDEN void *
 sos_alloc (size_t size)
 {
diff -ur libunwind/src/x86/regname.c libunwind-mod/src/x86/regname.c
--- libunwind/src/x86/regname.c	2005-03-04 14:26:18.451083800 -0600
+++ libunwind-mod/src/x86/regname.c	2005-03-04 14:24:38.126335480 -0600
@@ -18,7 +18,7 @@
 PROTECTED const char *
 unw_regname (unw_regnum_t reg)
 {
-  if (reg < (unw_regnum_t) NELEMS (regname))
+  if (reg < (unw_regnum_t) ARRAY_SIZE (regname))
     return regname[reg];
   else
     return "???";
diff -ur libunwind/src/x86_64/Gresume.c libunwind-mod/src/x86_64/Gresume.c
--- libunwind/src/x86_64/Gresume.c	2005-03-04 14:26:18.451083800 -0600
+++ libunwind-mod/src/x86_64/Gresume.c	2005-03-04 14:24:38.128335176 -0600
@@ -46,7 +46,7 @@
   abort ();
 }
 
-IDDEN inline int
+HIDDEN inline int
 x86_64_local_resume (unw_addr_space_t as, unw_cursor_t *cursor, void *arg)
 {
 #if defined(__linux)
diff -ur libunwind/src/x86_64/regname.c libunwind-mod/src/x86_64/regname.c
--- libunwind/src/x86_64/regname.c	2005-03-04 14:26:18.451083800 -0600
+++ libunwind-mod/src/x86_64/regname.c	2005-03-04 14:24:38.129335024 -0600
@@ -49,7 +49,7 @@
 PROTECTED const char *
 unw_regname (unw_regnum_t reg)
 {
-  if (reg < (unw_regnum_t) NELEMS (regname))
+  if (reg < (unw_regnum_t) ARRAY_SIZE (regname))
     return regname[reg];
   else
     return "???";