From ca8ed5ea660fb6275799a3b7f138b201c41a667b Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Sat, 25 Jul 2015 10:33:45 -0400
Subject: [PATCH] index_server: Fix the build.

Partially based on a patch from Paradoxianer. Thanks!
---
 src/servers/index/AnalyserDispatcher.h | 2 +-
 src/servers/index/IndexServer.cpp      | 2 +-
 src/servers/index/VolumeWatcher.cpp    | 4 ++--
 src/servers/index/VolumeWatcher.h      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/servers/index/AnalyserDispatcher.h b/src/servers/index/AnalyserDispatcher.h
index 95e596ba46..7da7bae889 100644
--- a/src/servers/index/AnalyserDispatcher.h
+++ b/src/servers/index/AnalyserDispatcher.h
@@ -49,7 +49,7 @@ protected:
 private:
 			FileAnalyser*		_FindAnalyser(const BString& name);
 
-			vint32				fStopped;
+			int32				fStopped;
 };
 
 #endif // ANALYSER_DISPATCHER
diff --git a/src/servers/index/IndexServer.cpp b/src/servers/index/IndexServer.cpp
index 9270609fe1..ef73b55134 100644
--- a/src/servers/index/IndexServer.cpp
+++ b/src/servers/index/IndexServer.cpp
@@ -317,7 +317,7 @@ IndexServer::_StartWatchingAddOns()
 	fPulseRunner = new BMessageRunner(&fAddOnMonitorHandler, &pulse, 1000000LL);
 		// the monitor handler needs a pulse to check if add-ons are ready
 
-	&fAddOnMonitorHandler->AddAddOnDirectories("index_server");
+	fAddOnMonitorHandler.AddAddOnDirectories("index_server");
 }
 
 
diff --git a/src/servers/index/VolumeWatcher.cpp b/src/servers/index/VolumeWatcher.cpp
index a945e17c8c..15762758d3 100644
--- a/src/servers/index/VolumeWatcher.cpp
+++ b/src/servers/index/VolumeWatcher.cpp
@@ -59,7 +59,7 @@ WatchNameHandler::EntryMoved(const char *name, const char *fromName,
 {
 	entry_ref ref(device, to_directory, name);
 	entry_ref refFrom(device, from_directory, fromName);
-	
+
 	fVolumeWatcher->fMovedList.CurrentList()->push_back(ref);
 	fVolumeWatcher->fMovedFromList.CurrentList()->push_back(refFrom);
 	fVolumeWatcher->_NewEntriesArrived();
@@ -470,7 +470,7 @@ VolumeWatcher::StartWatching()
 void
 VolumeWatcher::Stop()
 {
-	
+
 	char name[255];
 	fVolume.GetName(name);
 
diff --git a/src/servers/index/VolumeWatcher.h b/src/servers/index/VolumeWatcher.h
index 7131ae3226..e17eea041c 100644
--- a/src/servers/index/VolumeWatcher.h
+++ b/src/servers/index/VolumeWatcher.h
@@ -71,7 +71,7 @@ private:
 			void				_SetBusy(bool busy = true);
 
 			VolumeWatcher*		fVolumeWatcher;
-			vint32				fBusy;
+			int32				fBusy;
 };