NetFS: fix build.

Fixes #11168.
2014-11-17 10:42:03 +01:00
parent 44f82a7875
commit f0d46bd83c
10 changed files with 10 additions and 10 deletions
@@ -138,7 +138,7 @@ private:
 	ServerManager*		fServerManager;
 	ExtendedServerInfo*	fOldServerInfo;
 	ExtendedServerInfo*	fServerInfo;
-	vint32				fFD;
+	int32				fFD;
 	bool				fUpdate;
 	bool				fSuccess;
 };
@@ -48,7 +48,7 @@ private:
 			Locker				fLock;
 			ServerInfoMap*		fServerInfos;
 			thread_id			fBroadcastListener;
-			vint32				fBroadcastListenerSocket;
+			int32				fBroadcastListenerSocket;
 			Listener*			fListener;
 			volatile bool		fTerminating;
 };
@@ -20,7 +20,7 @@ public:
 			status_t			GetPeerAddress(NetAddress *address) const;

 private:
-			vint32				fSocket;
+			int32				fSocket;
 			bool				fClosed;
 };

@@ -66,7 +66,7 @@ private:
 			Resolver*			fResolver;

 	static	Resolver* volatile	sResolver;
-	static	vint32				sLockCounter;
+	static	int32				sLockCounter;
 };

 #endif	// NET_FS_NET_ADDRESS_H
@@ -41,7 +41,7 @@ private:
 			bool				fOwnsRequestHandler;
 			DownStreamThread*	fThreads;
 			int32				fThreadCount;
-			vint32				fTerminationCount;
+			int32				fTerminationCount;
 };

 #endif	// NET_FS_REQUEST_CONNECTION_H
@@ -24,7 +24,7 @@ template<typename T> T min(const T& a, const T& b) { return (a < b ? a : b); }
 */
 static inline
 void
-safe_closesocket(vint32& socketVar)
+safe_closesocket(int32& socketVar)
 {
 	int32 socket = atomic_or(&socketVar, -1);
 #ifdef __HAIKU__
@@ -193,7 +193,7 @@ private:
 			thread_id			fNodeMonitoringProcessor;
 			Locker				fLock;
 			int32				fReferenceCount;
-			vint32				fInitialized;
+			int32				fInitialized;
 			bool				fClosed;
 			bool				fError;
 			bool				fInverseClientEndianess;
@@ -109,7 +109,7 @@ private:
 			Permissions			fSharePermissions;
 			bool				fMounted;

-	static	vint32				sNextVolumeID;
+	static	int32				sNextVolumeID;
 };

 // NodeMonitoringProcessor
@@ -91,7 +91,7 @@ private:
 			sem_id				fBroadcasterSemaphore;
 			thread_id			fServerInfoConnectionListener;
 			vint32				fServerInfoConnectionListenerSocket;
-			vint32				fServerInfoUpdated;
+			int32				fServerInfoUpdated;
 			bool				fUseBroadcasting;
 			volatile bool		fTerminating;
 };
@@ -301,4 +301,4 @@ NetAddressResolver::_Unlock()
 NetAddressResolver::Resolver* volatile NetAddressResolver::sResolver = NULL;

 // sLockCounter
-vint32 NetAddressResolver::sLockCounter = 0;
+int32 NetAddressResolver::sLockCounter = 0;