diff --git a/‎CMakeLists.txt‎
Lines changed: 1 addition & 0 deletions b/‎CMakeLists.txt‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎td/mtproto/HandshakeActor.cpp‎
Lines changed: 2 additions & 2 deletions b/‎td/mtproto/HandshakeActor.cpp‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎td/mtproto/Ping.cpp‎
Lines changed: 1 addition & 1 deletion b/‎td/mtproto/Ping.cpp‎
Lines changed: 1 addition & 1 deletion
@@ -31,6 +31,7 @@ prevent_in_source_build()
 
 option(TD_ENABLE_JNI "Use \"ON\" to enable JNI-compatible TDLib API.")
 option(TD_ENABLE_DOTNET "Use \"ON\" to enable generation of C++/CLI or C++/CX TDLib API bindings.")
+option(TD_EXPERIMENTAL_WATCH_OS "Use \"ON\" to enable watch os support.")
 
 if (TD_ENABLE_DOTNET AND (CMAKE_VERSION VERSION_LESS "3.1.0"))
   message(FATAL_ERROR "CMake 3.1.0 or higher is required. You are running version ${CMAKE_VERSION}.")
 
@@ -55,8 +55,8 @@ void HandshakeActor::return_connection(Status status) {
     CHECK(!raw_connection_promise_);
     return;
   }
-  if (status.is_error() && !raw_connection->debug_str_.empty()) {
-    status = Status::Error(status.code(), PSLICE() << status.message() << " : " << raw_connection->debug_str_);
+  if (status.is_error() && !raw_connection->extra().debug_str.empty()) {
+    status = Status::Error(status.code(), PSLICE() << status.message() << " : " << raw_connection->extra().debug_str);
   }
   Scheduler::unsubscribe(raw_connection->get_poll_info().get_pollable_fd_ref());
   if (raw_connection_promise_) {
 
@@ -85,7 +85,7 @@ ActorOwn<> create_ping_actor(string debug, unique_ptr<RawConnection> raw_connect
           raw_connection->close();
           promise_.set_error(std::move(status));
         } else {
-          raw_connection->rtt_ = ping_connection_->rtt();
+          raw_connection->extra().rtt = ping_connection_->rtt();
           if (raw_connection->stats_callback()) {
             raw_connection->stats_callback()->on_pong();
           }
Original file line number	Diff line number	Diff line change
`@@ -55,8 +55,8 @@ void HandshakeActor::return_connection(Status status) {`
`55`	`55`	`CHECK(!raw_connection_promise_);`
`56`	`56`	`return;`
`57`	`57`	`}`
`58`		`- if (status.is_error() && !raw_connection->debug_str_.empty()) {`
`59`		`- status = Status::Error(status.code(), PSLICE() << status.message() << " : " << raw_connection->debug_str_);`
	`58`	`+ if (status.is_error() && !raw_connection->extra().debug_str.empty()) {`
	`59`	`+ status = Status::Error(status.code(), PSLICE() << status.message() << " : " << raw_connection->extra().debug_str);`
`60`	`60`	`}`
`61`	`61`	`Scheduler::unsubscribe(raw_connection->get_poll_info().get_pollable_fd_ref());`
`62`	`62`	`if (raw_connection_promise_) {`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ ActorOwn<> create_ping_actor(string debug, unique_ptr<RawConnection> raw_connect`
`85`	`85`	`raw_connection->close();`
`86`	`86`	`promise_.set_error(std::move(status));`
`87`	`87`	`} else {`
`88`		`- raw_connection->rtt_ = ping_connection_->rtt();`
	`88`	`+ raw_connection->extra().rtt = ping_connection_->rtt();`
`89`	`89`	`if (raw_connection->stats_callback()) {`
`90`	`90`	`raw_connection->stats_callback()->on_pong();`
`91`	`91`	`}`