*** old/src/os_cpu/linux_x86/vm/vmStructs_linux_x86.hpp	Tue Sep 13 12:29:04 2011
--- new/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp	Tue Sep 13 12:29:04 2011

*** 20,31 ****
--- 20,31 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   *
   */
  
! #ifndef OS_CPU_LINUX_X86_VM_VMSTRUCTS_LINUX_X86_HPP
! #define OS_CPU_LINUX_X86_VM_VMSTRUCTS_LINUX_X86_HPP
! #ifndef OS_CPU_BSD_X86_VM_VMSTRUCTS_BSD_X86_HPP
! #define OS_CPU_BSD_X86_VM_VMSTRUCTS_BSD_X86_HPP
  
  // These are the OS and CPU-specific fields, types and integer
  // constants required by the Serviceability Agent. This file is
  // referenced by vmStructs.cpp.
  

*** 32,42 ****
--- 32,42 ----
  #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) \
                                                                                                                                       \
    /******************************/                                                                                                   \
    /* Threads (NOTE: incomplete) */                                                                                                   \
    /******************************/                                                                                                   \
!   nonstatic_field(OSThread,                      _thread_id,                                      pid_t)                             \
!   nonstatic_field(OSThread,                      _thread_id,                                      pthread_t)                             \
    nonstatic_field(OSThread,                      _pthread_id,                                     pthread_t)                         \
    /* This must be the last entry, and must be present */                                                                             \
    last_entry()
  
  

*** 60,65 ****
--- 60,65 ----
  #define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \
                                                                          \
    /* This must be the last entry, and must be present */                \
    last_entry()
  
! #endif // OS_CPU_LINUX_X86_VM_VMSTRUCTS_LINUX_X86_HPP
! #endif // OS_CPU_BSD_X86_VM_VMSTRUCTS_BSD_X86_HPP