Index: webrtc/base/nethelpers.h |
diff --git a/webrtc/base/nethelpers.h b/webrtc/base/nethelpers.h |
index b0727f861b6a2910b225b839447e21d02911bc74..9a8e6073dd49c759254a91f4e0f421044ff5a645 100644 |
--- a/webrtc/base/nethelpers.h |
+++ b/webrtc/base/nethelpers.h |
@@ -11,56 +11,9 @@ |
#ifndef WEBRTC_BASE_NETHELPERS_H_ |
#define WEBRTC_BASE_NETHELPERS_H_ |
-#if defined(WEBRTC_POSIX) |
-#include <netdb.h> |
-#include <stddef.h> |
-#elif WEBRTC_WIN |
-#include <winsock2.h> // NOLINT |
-#endif |
-#include <list> |
- |
-#include "webrtc/base/asyncresolverinterface.h" |
-#include "webrtc/base/signalthread.h" |
-#include "webrtc/base/sigslot.h" |
-#include "webrtc/base/socketaddress.h" |
- |
-namespace rtc { |
- |
-class AsyncResolverTest; |
- |
-// AsyncResolver will perform async DNS resolution, signaling the result on |
-// the SignalDone from AsyncResolverInterface when the operation completes. |
-class AsyncResolver : public SignalThread, public AsyncResolverInterface { |
- public: |
- AsyncResolver(); |
- ~AsyncResolver() override; |
- |
- void Start(const SocketAddress& addr) override; |
- bool GetResolvedAddress(int family, SocketAddress* addr) const override; |
- int GetError() const override; |
- void Destroy(bool wait) override; |
- |
- const std::vector<IPAddress>& addresses() const { return addresses_; } |
- void set_error(int error) { error_ = error; } |
- |
- protected: |
- void DoWork() override; |
- void OnWorkDone() override; |
- |
- private: |
- SocketAddress addr_; |
- std::vector<IPAddress> addresses_; |
- int error_; |
-}; |
- |
-// rtc namespaced wrappers for inet_ntop and inet_pton so we can avoid |
-// the windows-native versions of these. |
-const char* inet_ntop(int af, const void *src, char* dst, socklen_t size); |
-int inet_pton(int af, const char* src, void *dst); |
- |
-bool HasIPv4Enabled(); |
-bool HasIPv6Enabled(); |
-} // namespace rtc |
+// This header is deprecated and is just left here temporarily during |
+// refactoring. See https://bugs.webrtc.org/7634 for more details. |
+#include "webrtc/rtc_base/nethelpers.h" |
#endif // WEBRTC_BASE_NETHELPERS_H_ |