Upgrade from trousers 0.3.3 to 0.3.6 and from testsuite 0.2 to 0.3.

src/include/threads.h

 
 /*
  * Licensed Materials - Property of IBM
  *
  * trousers - An open source TCG Software Stack
  *
  * (C) Copyright International Business Machines Corp. 2006
  *
  */
 
@@ skipping 13 matching lines @@
 #define MUTEX_DECLARE_EXTERN(m) extern pthread_mutex_t m
 
 /* condition variable abstractions */
 #define COND_DECLARE(c)         pthread_cond_t c
 #define COND_INIT(c)            pthread_cond_init(&c, NULL)
 #define COND_VAR                pthread_cond_t
 #define COND_WAIT(c,m)          pthread_cond_wait(c,m)
 #define COND_SIGNAL(c)          pthread_cond_signal(c)
 
 /* thread abstractions */
-#define THREAD_ID                       ((size_t)pthread_self())
+#define THREAD_ID                       ((THREAD_TYPE)pthread_self())
 #define THREAD_TYPE                     pthread_t
 #define THREAD_JOIN                     pthread_join
 #define THREAD_DETACH                   pthread_detach
 #define THREAD_ATTR_DECLARE(a)          pthread_attr_t a
 #define THREAD_ATTR_INIT(a)             pthread_attr_init(&a)
 #define THREAD_ATTR_SETJOINABLE(a)      pthread_attr_setdetachstate(&a, PTHREAD_CREATE_JOINABLE)
 #define THREAD_EXIT                     pthread_exit
 #define THREAD_CREATE(a,b,c,d)          pthread_create(a,b,c,d)
 #define THREAD_SET_SIGNAL_MASK          pthread_sigmask
-#define THREAD_NULL                     (THREAD_TYPE)0
+#define THREAD_NULL                     (THREAD_TYPE *)0
 
 #else
 
 #error No threading library defined! (Cannot find pthread.h)
 
 #endif
 
 #endif