From f2a5a29d1283cdcd5efbe31218f295fde5821bf3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 18 May 2018 21:07:31 +0300
Subject: [PATCH] Alpha version 1.2.21: Fix build for Xcode.

---
 .../SourceFiles/mtproto/connection_resolving.cpp     |  2 +-
 .../SourceFiles/mtproto/special_config_request.cpp   | 12 ------------
 .../SourceFiles/mtproto/special_config_request.h     | 12 +++++++++++-
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/Telegram/SourceFiles/mtproto/connection_resolving.cpp b/Telegram/SourceFiles/mtproto/connection_resolving.cpp
index d7f5cba215..4d9d535c4d 100644
--- a/Telegram/SourceFiles/mtproto/connection_resolving.cpp
+++ b/Telegram/SourceFiles/mtproto/connection_resolving.cpp
@@ -178,7 +178,7 @@ TimeMs ResolvingConnection::pingTime() const {
 }
 
 TimeMs ResolvingConnection::fullConnectTimeout() const {
-	return kOneConnectionTimeout * std::max(_proxy.resolvedIPs.size(), 1U);
+	return kOneConnectionTimeout * qMax(int(_proxy.resolvedIPs.size()), 1);
 }
 
 void ResolvingConnection::sendData(mtpBuffer &buffer) {
diff --git a/Telegram/SourceFiles/mtproto/special_config_request.cpp b/Telegram/SourceFiles/mtproto/special_config_request.cpp
index 8b8b214230..4d04783df8 100644
--- a/Telegram/SourceFiles/mtproto/special_config_request.cpp
+++ b/Telegram/SourceFiles/mtproto/special_config_request.cpp
@@ -129,18 +129,6 @@ QByteArray ConcatenateDnsTxtFields(const std::vector<DnsEntry> &response) {
 
 } // namespace
 
-struct ServiceWebRequest {
-	ServiceWebRequest(not_null<QNetworkReply*> reply);
-	ServiceWebRequest(ServiceWebRequest &&other);
-	ServiceWebRequest &operator=(ServiceWebRequest &&other);
-	~ServiceWebRequest();
-
-	void destroy();
-
-	QPointer<QNetworkReply> reply;
-
-};
-
 ServiceWebRequest::ServiceWebRequest(not_null<QNetworkReply*> reply)
 : reply(reply.get()) {
 }
diff --git a/Telegram/SourceFiles/mtproto/special_config_request.h b/Telegram/SourceFiles/mtproto/special_config_request.h
index ddeabbf01d..d56744ae5a 100644
--- a/Telegram/SourceFiles/mtproto/special_config_request.h
+++ b/Telegram/SourceFiles/mtproto/special_config_request.h
@@ -11,7 +11,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace MTP {
 
-struct ServiceWebRequest;
+struct ServiceWebRequest {
+        ServiceWebRequest(not_null<QNetworkReply*> reply);
+        ServiceWebRequest(ServiceWebRequest &&other);
+        ServiceWebRequest &operator=(ServiceWebRequest &&other);
+        ~ServiceWebRequest();
+
+        void destroy();
+
+        QPointer<QNetworkReply> reply;
+
+};
 
 class SpecialConfigRequest : public QObject {
 public: