--- a/src/os/haiku/vm/os_haiku.hpp	Tue Oct 27 03:05:21 2009 -0700
+++ b/src/os/haiku/vm/os_haiku.hpp	Tue Oct 27 08:40:50 2009 -0700
@@ -55,16 +55,16 @@ class Haiku {
   static address handler_start, handler_end; // start and end pc of thr_sighndlrinfo
 
   static bool valid_stack_address(Thread* thread, address sp);
-//  static bool valid_ucontext(Thread* thread, ucontext_t* valid, ucontext_t* suspect);
-//  static ucontext_t* get_valid_uc_in_signal_handler(Thread* thread,
-//    ucontext_t* uc);
-//
-//  static ExtendedPC  ucontext_get_ExtendedPC(ucontext_t* uc);
-//  static intptr_t*   ucontext_get_sp(ucontext_t* uc);
-//
-//  // For Analyzer Forte AsyncGetCallTrace profiling support:
-//  static ExtendedPC fetch_frame_from_ucontext(Thread* thread, ucontext_t* uc,
-//    intptr_t** ret_sp, intptr_t** ret_fp);
+  static bool valid_ucontext(Thread* thread, struct vregs* valid, struct vregs* suspect);
+  static struct vregs* get_valid_uc_in_signal_handler(Thread* thread,
+    struct vregs* uc);
+
+  static ExtendedPC  ucontext_get_ExtendedPC(struct vregs* uc);
+  static intptr_t*   ucontext_get_sp(struct vregs* uc);
+
+  // For Analyzer Forte AsyncGetCallTrace profiling support:
+  static ExtendedPC fetch_frame_from_ucontext(Thread* thread, struct vregs* uc,
+    intptr_t** ret_sp, intptr_t** ret_fp);
 
   static void hotspot_sigmask(Thread* thread);