From f0d46bd83cd4b50fc63fdff30bd71400a608aaed Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 17 Nov 2014 10:42:03 +0100 Subject: [PATCH] NetFS: fix build. Fixes #11168. --- src/add-ons/kernel/file_systems/netfs/client/ServerManager.cpp | 2 +- src/add-ons/kernel/file_systems/netfs/client/ServerManager.h | 2 +- .../kernel/file_systems/netfs/headers/shared/InsecureChannel.h | 2 +- .../kernel/file_systems/netfs/headers/shared/NetAddress.h | 2 +- .../file_systems/netfs/headers/shared/RequestConnection.h | 2 +- src/add-ons/kernel/file_systems/netfs/headers/shared/Utils.h | 2 +- src/add-ons/kernel/file_systems/netfs/server/ClientConnection.h | 2 +- src/add-ons/kernel/file_systems/netfs/server/ClientVolume.h | 2 +- src/add-ons/kernel/file_systems/netfs/server/NetFSServer.h | 2 +- src/add-ons/kernel/file_systems/netfs/shared/NetAddress.cpp | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/add-ons/kernel/file_systems/netfs/client/ServerManager.cpp b/src/add-ons/kernel/file_systems/netfs/client/ServerManager.cpp index eff50b4579..5f4073ce65 100644 --- a/src/add-ons/kernel/file_systems/netfs/client/ServerManager.cpp +++ b/src/add-ons/kernel/file_systems/netfs/client/ServerManager.cpp @@ -138,7 +138,7 @@ private: ServerManager* fServerManager; ExtendedServerInfo* fOldServerInfo; ExtendedServerInfo* fServerInfo; - vint32 fFD; + int32 fFD; bool fUpdate; bool fSuccess; }; diff --git a/src/add-ons/kernel/file_systems/netfs/client/ServerManager.h b/src/add-ons/kernel/file_systems/netfs/client/ServerManager.h index 00a2fb12a7..7aae5d5c46 100644 --- a/src/add-ons/kernel/file_systems/netfs/client/ServerManager.h +++ b/src/add-ons/kernel/file_systems/netfs/client/ServerManager.h @@ -48,7 +48,7 @@ private: Locker fLock; ServerInfoMap* fServerInfos; thread_id fBroadcastListener; - vint32 fBroadcastListenerSocket; + int32 fBroadcastListenerSocket; Listener* fListener; volatile bool fTerminating; }; diff --git a/src/add-ons/kernel/file_systems/netfs/headers/shared/InsecureChannel.h b/src/add-ons/kernel/file_systems/netfs/headers/shared/InsecureChannel.h index c8d0a689c9..3402d2cb90 100644 --- a/src/add-ons/kernel/file_systems/netfs/headers/shared/InsecureChannel.h +++ b/src/add-ons/kernel/file_systems/netfs/headers/shared/InsecureChannel.h @@ -20,7 +20,7 @@ public: status_t GetPeerAddress(NetAddress *address) const; private: - vint32 fSocket; + int32 fSocket; bool fClosed; }; diff --git a/src/add-ons/kernel/file_systems/netfs/headers/shared/NetAddress.h b/src/add-ons/kernel/file_systems/netfs/headers/shared/NetAddress.h index fb5c57b242..0fd89946d0 100644 --- a/src/add-ons/kernel/file_systems/netfs/headers/shared/NetAddress.h +++ b/src/add-ons/kernel/file_systems/netfs/headers/shared/NetAddress.h @@ -66,7 +66,7 @@ private: Resolver* fResolver; static Resolver* volatile sResolver; - static vint32 sLockCounter; + static int32 sLockCounter; }; #endif // NET_FS_NET_ADDRESS_H diff --git a/src/add-ons/kernel/file_systems/netfs/headers/shared/RequestConnection.h b/src/add-ons/kernel/file_systems/netfs/headers/shared/RequestConnection.h index 9819f54f3e..253fba3c38 100644 --- a/src/add-ons/kernel/file_systems/netfs/headers/shared/RequestConnection.h +++ b/src/add-ons/kernel/file_systems/netfs/headers/shared/RequestConnection.h @@ -41,7 +41,7 @@ private: bool fOwnsRequestHandler; DownStreamThread* fThreads; int32 fThreadCount; - vint32 fTerminationCount; + int32 fTerminationCount; }; #endif // NET_FS_REQUEST_CONNECTION_H diff --git a/src/add-ons/kernel/file_systems/netfs/headers/shared/Utils.h b/src/add-ons/kernel/file_systems/netfs/headers/shared/Utils.h index 7fb05f9a19..f2536b5039 100644 --- a/src/add-ons/kernel/file_systems/netfs/headers/shared/Utils.h +++ b/src/add-ons/kernel/file_systems/netfs/headers/shared/Utils.h @@ -24,7 +24,7 @@ template 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__ diff --git a/src/add-ons/kernel/file_systems/netfs/server/ClientConnection.h b/src/add-ons/kernel/file_systems/netfs/server/ClientConnection.h index 9a36a16d74..5d329f7440 100644 --- a/src/add-ons/kernel/file_systems/netfs/server/ClientConnection.h +++ b/src/add-ons/kernel/file_systems/netfs/server/ClientConnection.h @@ -193,7 +193,7 @@ private: thread_id fNodeMonitoringProcessor; Locker fLock; int32 fReferenceCount; - vint32 fInitialized; + int32 fInitialized; bool fClosed; bool fError; bool fInverseClientEndianess; diff --git a/src/add-ons/kernel/file_systems/netfs/server/ClientVolume.h b/src/add-ons/kernel/file_systems/netfs/server/ClientVolume.h index 44b609f3dd..ec97daeebc 100644 --- a/src/add-ons/kernel/file_systems/netfs/server/ClientVolume.h +++ b/src/add-ons/kernel/file_systems/netfs/server/ClientVolume.h @@ -109,7 +109,7 @@ private: Permissions fSharePermissions; bool fMounted; - static vint32 sNextVolumeID; + static int32 sNextVolumeID; }; // NodeMonitoringProcessor diff --git a/src/add-ons/kernel/file_systems/netfs/server/NetFSServer.h b/src/add-ons/kernel/file_systems/netfs/server/NetFSServer.h index 5348bc42ce..0fa5dfbb38 100644 --- a/src/add-ons/kernel/file_systems/netfs/server/NetFSServer.h +++ b/src/add-ons/kernel/file_systems/netfs/server/NetFSServer.h @@ -91,7 +91,7 @@ private: sem_id fBroadcasterSemaphore; thread_id fServerInfoConnectionListener; vint32 fServerInfoConnectionListenerSocket; - vint32 fServerInfoUpdated; + int32 fServerInfoUpdated; bool fUseBroadcasting; volatile bool fTerminating; }; diff --git a/src/add-ons/kernel/file_systems/netfs/shared/NetAddress.cpp b/src/add-ons/kernel/file_systems/netfs/shared/NetAddress.cpp index 33d8d53d1b..d68bea0306 100644 --- a/src/add-ons/kernel/file_systems/netfs/shared/NetAddress.cpp +++ b/src/add-ons/kernel/file_systems/netfs/shared/NetAddress.cpp @@ -301,4 +301,4 @@ NetAddressResolver::_Unlock() NetAddressResolver::Resolver* volatile NetAddressResolver::sResolver = NULL; // sLockCounter -vint32 NetAddressResolver::sLockCounter = 0; +int32 NetAddressResolver::sLockCounter = 0;