From b82c928e45993025b7f75360dd8c71ae03f87d33 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Sat, 7 Jan 2017 16:20:46 -0800 Subject: [PATCH 1/2] FreeBSD fix --- lib/Common.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/Common.cpp b/lib/Common.cpp index 0bbd41a..0b56036 100644 --- a/lib/Common.cpp +++ b/lib/Common.cpp @@ -1,5 +1,6 @@ #ifndef _WIN32 #include +#include #if __APPLE__ #include #endif @@ -27,7 +28,7 @@ u64 GetGCTicks() { #if __APPLE__ return mach_absolute_time() * MachToDolphinNum / MachToDolphinDenom; -#elif __linux__ +#elif __linux__ || __FreeBSD__ struct timespec tp; clock_gettime(CLOCK_MONOTONIC, &tp); From d7147cd3f79f6f4870c78487dc32384ed1655fe7 Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Sat, 7 Jan 2017 14:22:49 -1000 Subject: [PATCH 2/2] Typo Fix --- DocMain.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DocMain.md b/DocMain.md index b614ff7..3debade 100644 --- a/DocMain.md +++ b/DocMain.md @@ -1,7 +1,7 @@ JBus Documentation {#mainpage} ============================== -JBus functions as a server for acceping connections from GBA emulator clients. +JBus functions as a server for accepting connections from GBA emulator clients. The jbus::Listener class may be constructed and [started](@ref jbus::Listener::start) to enque incoming jbus::Endpoint instances.