* Fixed build under R5/Dano that was broken since Stippi added vector icon support.

* Separated Haiku's icon stuff a bit better, so that Tracker can still be built
  without having Haiku headers around.
* Minor cleanup.


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

src/kits/tracker/TrackerInitialState.cpp

@@ -164,7 +164,7 @@ TTracker::InstallMimeIfNeeded(const char *type, int32 bitsID,
 # define B_BITMAP_NO_SERVER_LINK 0
 #endif
 
-#if __HAIKU__
+#ifdef __HAIKU__
 	BBitmap vectorIcon(BRect(0, 0, 31, 31), B_BITMAP_NO_SERVER_LINK, B_RGB32);
 #endif
 	BBitmap largeIcon(BRect(0, 0, 31, 31), B_BITMAP_NO_SERVER_LINK, B_CMAP8);
@@ -175,7 +175,7 @@ TTracker::InstallMimeIfNeeded(const char *type, int32 bitsID,
 	bool installed = mime.IsInstalled();
 	
 	if (!installed
-#if __HAIKU__
+#ifdef __HAIKU__
 		|| (bitsID >= 0 && ((forceMask & kForceLargeIcon)
 			|| mime.GetIcon(&vectorIcon, B_LARGE_ICON) != B_OK))
 #endif
@@ -194,7 +194,7 @@ TTracker::InstallMimeIfNeeded(const char *type, int32 bitsID,
 			mime.Install();
 
 		if (bitsID >= 0) {
-#if __HAIKU__
+#ifdef __HAIKU__
 			const uint8* iconData;
 			size_t iconSize;
 			if (GetTrackerResources()->