__HAIKU__ is now also defined for the test environment.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16587 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/apps/deskbar/BarApp.cpp

@@ -99,7 +99,7 @@ TBarApp::TBarApp()
 	InitSettings();
 	InitIconPreloader();
 
-#if defined(__HAIKU__) || defined(HAIKU_TARGET_PLATFORM_LIBBE_TEST)
+#ifdef __HAIKU__
 	be_roster->StartWatching(this);
 #endif
 
@@ -134,7 +134,7 @@ TBarApp::TBarApp()
 
 TBarApp::~TBarApp()
 {
-#if defined(__HAIKU__) || defined(HAIKU_TARGET_PLATFORM_LIBBE_TEST)
+#ifdef __HAIKU__
 	be_roster->StopWatching(this);
 #endif
 

src/apps/deskbar/BeMenu.cpp

@@ -445,7 +445,7 @@ TBeMenu::ResetTargets()
 				case CMD_SUSPEND_SYSTEM:
 				case CMD_SHUTDOWN_SYSTEM:
 					// restart/shutdown
-#if __HAIKU__
+#ifdef __HAIKU__
 					item->SetTarget(be_app);
 #else
 					item->SetTarget(BMessenger(ROSTER_SIG));