NetFS: fix build.

Fixes #11168.
This commit is contained in:
Adrien Destugues
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; ServerManager* fServerManager;
ExtendedServerInfo* fOldServerInfo; ExtendedServerInfo* fOldServerInfo;
ExtendedServerInfo* fServerInfo; ExtendedServerInfo* fServerInfo;
vint32 fFD; int32 fFD;
bool fUpdate; bool fUpdate;
bool fSuccess; bool fSuccess;
}; };
@@ -48,7 +48,7 @@ private:
Locker fLock; Locker fLock;
ServerInfoMap* fServerInfos; ServerInfoMap* fServerInfos;
thread_id fBroadcastListener; thread_id fBroadcastListener;
vint32 fBroadcastListenerSocket; int32 fBroadcastListenerSocket;
Listener* fListener; Listener* fListener;
volatile bool fTerminating; volatile bool fTerminating;
}; };
@@ -20,7 +20,7 @@ public:
status_t GetPeerAddress(NetAddress *address) const; status_t GetPeerAddress(NetAddress *address) const;
private: private:
vint32 fSocket; int32 fSocket;
bool fClosed; bool fClosed;
}; };
@@ -66,7 +66,7 @@ private:
Resolver* fResolver; Resolver* fResolver;
static Resolver* volatile sResolver; static Resolver* volatile sResolver;
static vint32 sLockCounter; static int32 sLockCounter;
}; };
#endif // NET_FS_NET_ADDRESS_H #endif // NET_FS_NET_ADDRESS_H
@@ -41,7 +41,7 @@ private:
bool fOwnsRequestHandler; bool fOwnsRequestHandler;
DownStreamThread* fThreads; DownStreamThread* fThreads;
int32 fThreadCount; int32 fThreadCount;
vint32 fTerminationCount; int32 fTerminationCount;
}; };
#endif // NET_FS_REQUEST_CONNECTION_H #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 static inline
void void
safe_closesocket(vint32& socketVar) safe_closesocket(int32& socketVar)
{ {
int32 socket = atomic_or(&socketVar, -1); int32 socket = atomic_or(&socketVar, -1);
#ifdef __HAIKU__ #ifdef __HAIKU__
@@ -193,7 +193,7 @@ private:
thread_id fNodeMonitoringProcessor; thread_id fNodeMonitoringProcessor;
Locker fLock; Locker fLock;
int32 fReferenceCount; int32 fReferenceCount;
vint32 fInitialized; int32 fInitialized;
bool fClosed; bool fClosed;
bool fError; bool fError;
bool fInverseClientEndianess; bool fInverseClientEndianess;
@@ -109,7 +109,7 @@ private:
Permissions fSharePermissions; Permissions fSharePermissions;
bool fMounted; bool fMounted;
static vint32 sNextVolumeID; static int32 sNextVolumeID;
}; };
// NodeMonitoringProcessor // NodeMonitoringProcessor
@@ -91,7 +91,7 @@ private:
sem_id fBroadcasterSemaphore; sem_id fBroadcasterSemaphore;
thread_id fServerInfoConnectionListener; thread_id fServerInfoConnectionListener;
vint32 fServerInfoConnectionListenerSocket; vint32 fServerInfoConnectionListenerSocket;
vint32 fServerInfoUpdated; int32 fServerInfoUpdated;
bool fUseBroadcasting; bool fUseBroadcasting;
volatile bool fTerminating; volatile bool fTerminating;
}; };
@@ -301,4 +301,4 @@ NetAddressResolver::_Unlock()
NetAddressResolver::Resolver* volatile NetAddressResolver::sResolver = NULL; NetAddressResolver::Resolver* volatile NetAddressResolver::sResolver = NULL;
// sLockCounter // sLockCounter
vint32 NetAddressResolver::sLockCounter = 0; int32 NetAddressResolver::sLockCounter = 0;