1.1 --- a/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp Fri May 18 09:15:15 2012 -0700
1.2 +++ b/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp Tue May 22 10:11:53 2012 +0200
1.3 @@ -29,18 +29,12 @@
1.4 // constants required by the Serviceability Agent. This file is
1.5 // referenced by vmStructs.cpp.
1.6
1.7 -#ifdef __APPLE__
1.8 -#define OS_THREAD_ID_TYPE thread_t
1.9 -#else
1.10 -#define OS_THREAD_ID_TYPE pthread_t
1.11 -#endif
1.12 -
1.13 #define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field, last_entry) \
1.14 \
1.15 /******************************/ \
1.16 /* Threads (NOTE: incomplete) */ \
1.17 /******************************/ \
1.18 - nonstatic_field(OSThread, _thread_id, OS_THREAD_ID_TYPE) \
1.19 + nonstatic_field(OSThread, _thread_id, OSThread::thread_id_t) \
1.20 nonstatic_field(OSThread, _pthread_id, pthread_t) \
1.21 /* This must be the last entry, and must be present */ \
1.22 last_entry()
1.23 @@ -52,7 +46,7 @@
1.24 /* Posix Thread IDs */ \
1.25 /**********************/ \
1.26 \
1.27 - declare_unsigned_integer_type(thread_t) \
1.28 + declare_unsigned_integer_type(OSThread::thread_id_t) \
1.29 declare_unsigned_integer_type(pthread_t) \
1.30 \
1.31 /* This must be the last entry, and must be present */ \
