--- old/src/os/bsd/vm/osThread_bsd.hpp	2012-02-15 10:54:10.000000000 +0100
+++ new/src/os/bsd/vm/osThread_bsd.hpp	2012-02-15 10:54:09.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,9 +40,7 @@
  private:
 
 #ifdef _ALLBSD_SOURCE
-  // _thread_id and _pthread_id are the same on BSD
-  // keep both to minimize code divergence in os_bsd.cpp
-  pthread_t _thread_id;
+  thread_t  _thread_id;
   pthread_t _pthread_id;
 #else
   // _thread_id is kernel thread id (similar to LWP id on Solaris). Each
@@ -64,7 +62,7 @@
   void    set_caller_sigmask(sigset_t sigmask)  { _caller_sigmask = sigmask; }
 
 #ifdef _ALLBSD_SOURCE
-  pthread_t thread_id() const {
+  thread_t thread_id() const {
     return _thread_id;
   }
 #else
@@ -84,7 +82,7 @@
   }
 #endif // ASSERT
 #ifdef _ALLBSD_SOURCE
-  void set_thread_id(pthread_t id) {
+  void set_thread_id(thread_t id) {
     _thread_id = id;
   }
 #else