AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-16 11:06:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix linux build

Browse Source
This commit is contained in:
UnknownShadow200 2019-07-05 21:04:58 +10:00
parent 47ea32922f
commit d1c633cc65
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Logger.c
View File

@ -20,18 +20,20 @@
/* POSIX can be shared between unix-ish systems */ /* POSIX can be shared between unix-ish systems */
#ifdef CC_BUILD_POSIX #ifdef CC_BUILD_POSIX
#include <execinfo.h>
#include <signal.h>
#if defined CC_BUILD_OPENBSD #if defined CC_BUILD_OPENBSD
#include <signal.h>
/* OpenBSD doesn't provide ucontext.h */ /* OpenBSD doesn't provide ucontext.h */
#elif defined CC_BUILD_LINUX #elif defined CC_BUILD_LINUX
/* Need to define this to get REG_ constants */ /* Need to define this to get REG_ constants */
#define __USE_GNU #define __USE_GNU
#include <ucontext.h> #include <ucontext.h>
#undef __USE_GNU #undef __USE_GNU
#include <signal.h>
#else #else
#include <signal.h>
#include <ucontext.h> #include <ucontext.h>
#endif #endif
#include <stdlib.h>
#endif #endif
@ -333,6 +335,7 @@ void Logger_Backtrace(String* trace, void* ctx) {
} }
} }
#elif defined CC_BUILD_POSIX #elif defined CC_BUILD_POSIX
#include <execinfo.h>
void Logger_Backtrace(String* trace, void* ctx) { void Logger_Backtrace(String* trace, void* ctx) {
String str; char strBuffer[384]; String str; char strBuffer[384];
void* addrs[40]; void* addrs[40];
@ -549,7 +552,6 @@ static void Logger_DumpRegisters(void* ctx) {
/* OS specific stuff */ /* OS specific stuff */
#if defined CC_BUILD_LINUX || defined CC_BUILD_SOLARIS #if defined CC_BUILD_LINUX || defined CC_BUILD_SOLARIS
#include <stdlib.h>
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>

2
src/Platform.c
View File

@ -58,7 +58,6 @@ const ReturnCode ReturnCode_SocketWouldBlock = WSAEWOULDBLOCK;
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/time.h> #include <sys/time.h>
#include <utime.h> #include <utime.h>
#include <poll.h>
#include <signal.h> #include <signal.h>
#define Platform_DecodeString(dst, src, len) String_AppendUtf8(dst, (uint8_t*)(src), len) #define Platform_DecodeString(dst, src, len) String_AppendUtf8(dst, (uint8_t*)(src), len)
@ -1517,6 +1516,7 @@ ReturnCode Socket_Poll(SocketHandle socket, int mode, bool* success) {
*success = FD_ISSET(socket, &set); return 0; *success = FD_ISSET(socket, &set); return 0;
} }
#else #else
#include <poll.h>
ReturnCode Socket_Poll(SocketHandle socket, int mode, bool* success) { ReturnCode Socket_Poll(SocketHandle socket, int mode, bool* success) {
struct pollfd pfd; struct pollfd pfd;
int flags; int flags;