Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes for compiling with musl #104

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+6 −2
Open

Fixes for compiling with musl #104

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b350685
BaseSocket: include time.h for timeval
JohannesKauffmann Dec 19, 2023
b52aa5d
BaseSocket: avoid non-standard time_t typedef
JohannesKauffmann Dec 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
BaseSocket: avoid non-standard time_t typedef 
time_t is defined in POSIX, __time_t is not.

Uncovered by compiling using musl.
@JohannesKauffmann
JohannesKauffmann committed Dec 19, 2023
commit b52aa5d2ff0c5f782eda8aeb4d7157a7be084c8a
4 changes: 2 additions & 2 deletions src/sockets/BaseSocket.cpp
View file
Original file line number Diff line number Diff line change
@@ -95,8 +95,8 @@ namespace sockets {
.tv_sec = static_cast<__darwin_suseconds_t>(recvTimeout.count()/1000),
.tv_usec = static_cast<__darwin_suseconds_t>((recvTimeout.count()%1000)*1000)
#elif __unix__
.tv_sec = static_cast<__time_t>(recvTimeout.count()/1000),
.tv_usec = static_cast<__time_t>((recvTimeout.count()%1000)*1000)
.tv_sec = static_cast<time_t>(recvTimeout.count()/1000),
.tv_usec = static_cast<time_t>((recvTimeout.count()%1000)*1000)
#elif defined(_WIN32) || defined(WIN32) || defined(_WIN64)
.tv_sec = static_cast<long int>(recvTimeout.count()/1000),
.tv_usec = static_cast<long int>((recvTimeout.count()%1000)*1000)