AxioDL
/
jbus
mirror of https://github.com/AxioDL/jbus.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/AxioDL/jbus

This commit is contained in:
Jack Andersen 2017-01-07 16:52:15 -10:00
parent 0153e0ee6a d7147cd3f7
commit 9db987d3dd
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DocMain.md
View File

@ -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.

3
lib/Common.cpp
View File

@ -1,5 +1,6 @@
#ifndef _WIN32
#include <unistd.h>
#include <sys/time.h>
#if __APPLE__
#include <mach/mach_time.h>
#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);