More build fixes of unittests, this time for x86_64.

src/add-ons/kernel/file_systems/udf/UdfDebug.cpp

@@ -183,7 +183,7 @@ int32
 _get_debug_indent_level()
 {
 #if !_KERNEL_MODE
-	return (int32)tls_get(get_tls_handle());
+	return (addr_t)tls_get(get_tls_handle());
 #else
 	return 1;
 #endif
@@ -200,7 +200,8 @@ void
 indent(uint8 tabCount)
 {
 #if !_KERNEL_MODE
-	tls_set(get_tls_handle(), (void*)(_get_debug_indent_level()+tabCount));
+	tls_set(get_tls_handle(),
+		(void*)(addr_t(_get_debug_indent_level()+tabCount)));
 #endif
 }
 
@@ -211,7 +212,8 @@ void
 unindent(uint8 tabCount)
 {
 #if !_KERNEL_MODE
-	tls_set(get_tls_handle(), (void*)(_get_debug_indent_level()-tabCount));
+	tls_set(get_tls_handle(),
+		(void*)(addr_t(_get_debug_indent_level()-tabCount)));
 #endif
 }
 

src/tests/kits/app/bmessenger/SMInvoker.cpp

@@ -116,7 +116,7 @@ SMInvoker4::Invoke(BMessenger &target, BHandler *replyHandler,
 				   BMessenger &replyMessenger)
 {
 	if (fUseReply)
-		fReplyMessage = new BMessage(0UL);
+		fReplyMessage = new BMessage(uint32(0));
 	status_t result = target.SendMessage(MSG_TEST, fReplyMessage);
 	return result;
 }
@@ -141,7 +141,7 @@ SMInvoker5::Invoke(BMessenger &target, BHandler *replyHandler,
 				   BMessenger &replyMessenger)
 {
 	if (fUseReply)
-		fReplyMessage = new BMessage(0UL);
+		fReplyMessage = new BMessage(uint32(0));
 	BMessage _message(MSG_TEST);
 	BMessage *message = (fUseMessage ? &_message : NULL);
 	status_t result = target.SendMessage(message, fReplyMessage,

src/tests/kits/app/broster/LaunchTester.cpp

@@ -715,7 +715,7 @@ CommonLaunchTest15(LaunchCaller &caller)
 	create_app(appFile1, appType1);
 	install_type(fileType1, appType1);
 	CHK(context(caller, fileType1, NULL) == B_OK);
-	context.WaitForMessage(MSG_STARTED, true);
+	context.WaitForMessage(uint32(MSG_STARTED), true);
 	team_id team = context.TeamAt(0);
 	CHK(team >= 0);
 	entry_ref ref = ref_for_team(team);

src/tests/kits/interface/bregion/RegionTestcase.cpp

@@ -108,7 +108,7 @@ RegionTestcase::RegionTestcase(std::string name) :
 RegionTestcase::~RegionTestcase()
 {
 	while(!listOfRegions.IsEmpty()) {
-		delete static_cast<BRegion *>(listOfRegions.RemoveItem((long int)0));
+		delete static_cast<BRegion *>(listOfRegions.RemoveItem(int32(0)));
 	}
 }
 

src/tests/kits/storage/PathTest.cpp

@@ -1352,8 +1352,8 @@ PathTest::FlattenableTest()
 		// flatten the path
 		struct flattened_ref { dev_t device; ino_t directory; char name[1]; };
 		size = path.FlattenedSize();
-		int32 expectedSize	// hehe, that's hacky ;-)
-			= (int32)((flattened_ref*)NULL)->name + strlen(ref.name) + 1;
+		ssize_t expectedSize	// hehe, that's hacky ;-)
+			= (ssize_t)((flattened_ref*)NULL)->name + strlen(ref.name) + 1;
 		CPPUNIT_ASSERT( size ==  expectedSize);
 		CPPUNIT_ASSERT( path.Flatten(buffer, sizeof(buffer)) == B_OK );
 		// check the flattened data

src/tests/kits/storage/ResourcesTest.cpp

@@ -943,8 +943,8 @@ ResourcesTest::ReadTest()
 												  NULL, NULL) == true );
 		CPPUNIT_ASSERT( resources.GetResourceInfo(info.type, info.name,
 												  NULL, NULL) == true );
-		CPPUNIT_ASSERT( resources.GetResourceInfo(0L, (type_code*)NULL, NULL,
-												  NULL, NULL) == true );
+		CPPUNIT_ASSERT( resources.GetResourceInfo(int32(0), (type_code*)NULL,
+												  NULL, NULL, NULL) == true );
 		CPPUNIT_ASSERT( resources.GetResourceInfo(info.type, 0, NULL,
 												  NULL, NULL) == true );
 		// LoadResource

src/tools/cppunit/TestShell.cpp

@@ -262,7 +262,7 @@ BTestShell::WasDebuggerCalled()
 {
 	void *var = tls_get(fTLSDebuggerCall);
 	tls_set(fTLSDebuggerCall, NULL);
-	return ((int)var > 1);
+	return ((addr_t)var > 1);
 }
 
 _EXPORT