*** compat/Thread.c.ORIG	Mon Aug 20 11:40:25 2007
--- compat/Thread.c	Tue Aug 21 00:14:12 2007
***************
*** 95,101 ****
   * Initialize the thread subsystems variables and set the concurrency
   * level in solaris.
   * ------------------------------------------------------------------- */
! void thread_init( ) {
      Condition_Initialize( &thread_sNum_cond );
  #if defined( sun )
      /* Solaris apparently doesn't default to timeslicing threads,
--- 95,101 ----
   * Initialize the thread subsystems variables and set the concurrency
   * level in solaris.
   * ------------------------------------------------------------------- */
! void AIX_thread_init( ) {
      Condition_Initialize( &thread_sNum_cond );
  #if defined( sun )
      /* Solaris apparently doesn't default to timeslicing threads,
***************
*** 202,208 ****
--- 202,210 ----
  #if   defined( HAVE_POSIX_THREAD )
              // Cray J90 doesn't have pthread_cancel; Iperf works okay without
  #ifdef HAVE_PTHREAD_CANCEL
+ #ifndef _AIX
              pthread_cancel( oldTID );
+ #endif
  #endif
  #else // Win32
              // this is a somewhat dangerous function; it's not
*** include/Thread.h.ORIG	Mon Aug 20 11:41:09 2007
--- include/Thread.h	Tue Aug 21 00:14:44 2007
***************
*** 100,106 ****
  #include "Settings.hpp"
  
      // initialize or destroy the thread subsystem
!     void thread_init( );
      void thread_destroy( );
  
      // start or stop a thread executing
--- 100,106 ----
  #include "Settings.hpp"
  
      // initialize or destroy the thread subsystem
!     void AIX_thread_init( );
      void thread_destroy( );
  
      // start or stop a thread executing
*** src/main.cpp.ORIG	Mon Aug 20 11:41:26 2007
--- src/main.cpp	Tue Aug 21 00:15:41 2007
***************
*** 145,151 ****
      Mutex_Initialize( &clients_mutex );
  
      // Initialize the thread subsystem
!     thread_init( );
  
      // Initialize the interrupt handling thread to 0
      sThread = thread_zeroid();
--- 145,151 ----
      Mutex_Initialize( &clients_mutex );
  
      // Initialize the thread subsystem
!     AIX_thread_init( );
  
      // Initialize the interrupt handling thread to 0
      sThread = thread_zeroid();