Merge branch 'ign-transport11' into scpeters/merge_11_12

gazebosim · Jun 26, 2023 · 73c3203 · 73c3203
2 parents 6c80037 + 65994b2
commit 73c3203
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -40,8 +40,8 @@ message(STATUS "\n\n-- ====== Finding Dependencies ======")
 #--------------------------------------
 # Find Protobuf
 gz_find_package(GzProtobuf
-                 REQUIRED
-                 PRETTY Protobuf)
+                REQUIRED
+                PRETTY Protobuf)
 
 #--------------------------------------
 # Find ZeroMQ

diff --git a/include/gz/transport/Discovery.hh b/include/gz/transport/Discovery.hh
@@ -807,7 +807,7 @@ namespace gz
         sockaddr_in clntAddr;
         socklen_t addrLen = sizeof(clntAddr);
 
-        int32_t received = recvfrom(this->sockets.at(0),
+        int64_t received = recvfrom(this->sockets.at(0),
               reinterpret_cast<raw_type *>(rcvStr),
               this->kMaxRcvStr, 0,
               reinterpret_cast<sockaddr *>(&clntAddr),