*** dbinc/mutex.h
--- dbinc/mutex.h
***************
*** 128,134 ****
  
  #ifndef	MUTEX_ALIGN
  #define	MUTEX_ALIGN	16
! #define	HPUX_MUTEX_PAD	 8
  #endif
  #endif
  
--- 128,138 ----
  
  #ifndef	MUTEX_ALIGN
  #define	MUTEX_ALIGN	16
! #ifdef __hpux__
! # define	HPUX_MUTEX_PAD	 8
! #else
! # define	HPUX_MUTEX_PAD	 4
! #endif
  #endif
  #endif
  
***************
*** 494,500 ****
  
  #ifndef	MUTEX_ALIGN
  #define	MUTEX_ALIGN	16
! #define	HPUX_MUTEX_PAD	 8
  #endif
  
  #ifdef LOAD_ACTUAL_MUTEX_CODE
--- 498,508 ----
  
  #ifndef	MUTEX_ALIGN
  #define	MUTEX_ALIGN	16
! #ifdef __hpux__
! # define	HPUX_MUTEX_PAD	 8
! #else
! # define	HPUX_MUTEX_PAD	 4
! #endif
  #endif
  
  #ifdef LOAD_ACTUAL_MUTEX_CODE
***************
*** 510,516 ****
  	__r & 1;							\
  })
  
! #define	MUTEX_UNSET(tsl)	(*(tsl) = -1)
  #define	MUTEX_INIT(tsl)		(MUTEX_UNSET(tsl), 0)
  #endif
  #endif
--- 518,524 ----
  	__r & 1;							\
  })
  
! #define	MUTEX_UNSET(tsl)        (*(volatile tsl_t *)(tsl) = -1)
  #define	MUTEX_INIT(tsl)		(MUTEX_UNSET(tsl), 0)
  #endif
  #endif