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

src/tcs/rpc/tcstp/rpc_evlog.c

Index: src/tcs/rpc/tcstp/rpc_evlog.c
diff --git a/src/tcs/rpc/tcstp/rpc_evlog.c b/src/tcs/rpc/tcstp/rpc_evlog.c
index 6341ef98fa2dd3010d10e7f999fb8b7c51fb030d..4187c254dbfb8a545a29449de52055a79b62a37e 100644
--- a/src/tcs/rpc/tcstp/rpc_evlog.c
+++ b/src/tcs/rpc/tcstp/rpc_evlog.c
@@ -39,7 +39,7 @@ tcs_wrap_GetPcrEvent(struct tcsd_thread_data *data)
 	if (getData(TCSD_PACKET_TYPE_UINT32, 0, &hContext, 0, &data->comm))
 		return TCSERR(TSS_E_INTERNAL_ERROR);
 
-	LogDebugFn("thread %zd context %x", THREAD_ID, hContext);
+	LogDebugFn("thread %ld context %x", THREAD_ID, hContext);
 
 	if (getData(TCSD_PACKET_TYPE_UINT32, 1, &pcrIndex, 0, &data->comm))
 		return TCSERR(TSS_E_INTERNAL_ERROR);
@@ -98,7 +98,7 @@ tcs_wrap_GetPcrEventsByPcr(struct tcsd_thread_data *data)
 	if (getData(TCSD_PACKET_TYPE_UINT32, 0, &hContext, 0, &data->comm))
 		return TCSERR(TSS_E_INTERNAL_ERROR);
 
-	LogDebugFn("thread %zd context %x", THREAD_ID, hContext);
+	LogDebugFn("thread %ld context %x", THREAD_ID, hContext);
 
 	if (getData(TCSD_PACKET_TYPE_UINT32, 1, &pcrIndex, 0, &data->comm))
 		return TCSERR(TSS_E_INTERNAL_ERROR);
@@ -153,7 +153,7 @@ tcs_wrap_GetPcrEventLog(struct tcsd_thread_data *data)
 	if (getData(TCSD_PACKET_TYPE_UINT32, 0, &hContext, 0, &data->comm))
 		return TCSERR(TSS_E_INTERNAL_ERROR);
 
-	LogDebugFn("thread %zd context %x", THREAD_ID, hContext);
+	LogDebugFn("thread %ld context %x", THREAD_ID, hContext);
 
 	result = TCS_GetPcrEventLog_Internal(hContext, &eventCount, &ppEvents);
 
@@ -199,7 +199,7 @@ tcs_wrap_LogPcrEvent(struct tcsd_thread_data *data)
 	if (getData(TCSD_PACKET_TYPE_UINT32, 0, &hContext, 0, &data->comm))
 		return TCSERR(TSS_E_INTERNAL_ERROR);
 
-	LogDebugFn("thread %zd context %x", THREAD_ID, hContext);
+	LogDebugFn("thread %ld context %x", THREAD_ID, hContext);
 
 	if (getData(TCSD_PACKET_TYPE_PCR_EVENT , 1, &event, 0, &data->comm))
 		return TCSERR(TSS_E_INTERNAL_ERROR);