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.

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

Allow building on macOS #104

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions src/Embedded_Display/vncclientthread.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -597,6 +597,13 @@ void VncClientThread::clientSetKeepalive()
return;
}

#if !defined(SOL_TCP) && defined(IPPROTO_TCP)
#define SOL_TCP IPPROTO_TCP
#endif
#if !defined(TCP_KEEPIDLE) && defined(TCP_KEEPALIVE)
#define TCP_KEEPIDLE TCP_KEEPALIVE
#endif

optval = m_keepalive.intervalSeconds;
if (setsockopt(cl->sock, IPPROTO_TCP, TCP_KEEPIDLE, &optval, optlen) < 0) {
qCritical(KRDC) << "setsockopt(TCP_KEEPIDLE)" << strerror(errno);
Expand Down
6 changes: 3 additions & 3 deletions src/System_Info.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,7 @@ bool System_Info::Update_VM_Computers_List()
ad.Audio_Card_List = Audio_Card_PPC;
ad.PSO_Initial_Graphic_Mode = true;
System_Info::Emulator_QEMU_2_0[ "qemu-system-ppc" ] = ad;

/*
ad = Available_Devices();
ad.System = Device_Map( "Power PC EMB 32Bit", "qemu-system-ppcemb" );
ad.CPU_List += CPU_PPC;
Expand All @@ -753,7 +753,7 @@ bool System_Info::Update_VM_Computers_List()
ad.Audio_Card_List = Audio_Card_PPC;
ad.PSO_Initial_Graphic_Mode = true;
System_Info::Emulator_QEMU_2_0[ "qemu-system-ppcemb" ] = ad;

*/
ad = Available_Devices();
ad.System = Device_Map( "Power PC 64Bit", "qemu-system-ppc64" );

Expand Down Expand Up @@ -1138,7 +1138,7 @@ QMap<QString, QString> System_Info::Find_QEMU_Binary_Files( const QString &path
emulFiles[ "qemu-system-mipsel" ] = "";
emulFiles[ "qemu-system-ppc" ] = "";
emulFiles[ "qemu-system-ppc64" ] = "";
emulFiles[ "qemu-system-ppcemb" ] = "";
// emulFiles[ "qemu-system-ppcemb" ] = "";
emulFiles[ "qemu-system-sh4" ] = "";
emulFiles[ "qemu-system-sh4eb" ] = "";
emulFiles[ "qemu-system-sparc" ] = "";
Expand Down