Skip to content

Commit

Permalink
Merge ign-transport11 ➡️ gz-transport12 (#413)
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Carroll <[email protected]>
  • Loading branch information
mjcarroll authored Jun 26, 2023
2 parents 6c80037 + 73c3203 commit 9147781
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ message(STATUS "\n\n-- ====== Finding Dependencies ======")
#--------------------------------------
# Find Protobuf
gz_find_package(GzProtobuf
REQUIRED
PRETTY Protobuf)
REQUIRED
PRETTY Protobuf)

#--------------------------------------
# Find ZeroMQ
Expand Down
2 changes: 1 addition & 1 deletion include/gz/transport/Discovery.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down

0 comments on commit 9147781

Please sign in to comment.