From de8ff799edf1fbfeee9447923497273dd254252c Mon Sep 17 00:00:00 2001 From: John Hodge Date: Tue, 1 Mar 2011 14:32:44 +0800 Subject: [PATCH] AcessNative - Compile fixes after select() implementation --- AcessNative/acesskernel_src/helpers.c | 3 ++- AcessNative/acesskernel_src/include/arch.h | 11 ++++++++++- AcessNative/acesskernel_src/server.c | 2 +- AcessNative/acesskernel_src/threads.c | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/AcessNative/acesskernel_src/helpers.c b/AcessNative/acesskernel_src/helpers.c index ef5f1db1..e598ef15 100644 --- a/AcessNative/acesskernel_src/helpers.c +++ b/AcessNative/acesskernel_src/helpers.c @@ -4,9 +4,10 @@ * * Kernel Main */ -#include +#include #include #include +#include #include void LogF(const char *Fmt, ...) diff --git a/AcessNative/acesskernel_src/include/arch.h b/AcessNative/acesskernel_src/include/arch.h index 8f0eb796..a6685b2d 100644 --- a/AcessNative/acesskernel_src/include/arch.h +++ b/AcessNative/acesskernel_src/include/arch.h @@ -4,7 +4,7 @@ #define _ARCH_H_ #include -#include +//#include #include #undef CLONE_VM #define _MODULE_NAME_ "NativeKernel" @@ -26,6 +26,13 @@ typedef intptr_t Uint; typedef intptr_t tVAddr; typedef intptr_t tPAddr; +typedef int BOOL; + +typedef uint32_t tTID; +typedef uint32_t tPID; +typedef uint32_t tUID; +typedef uint32_t tGID; + struct sShortSpinlock { int IsValid; @@ -35,5 +42,7 @@ struct sShortSpinlock #define SHORTLOCK(...) #define SHORTREL(...) +#define NUM_CFG_ENTRIES 10 + #endif diff --git a/AcessNative/acesskernel_src/server.c b/AcessNative/acesskernel_src/server.c index af33bfd4..5d46f200 100644 --- a/AcessNative/acesskernel_src/server.c +++ b/AcessNative/acesskernel_src/server.c @@ -94,10 +94,10 @@ tClient *Server_GetClient(int ClientID) ret->CurrentRequest = NULL; if( !ret->WorkerThread ) { - ret->WorkerThread = SDL_CreateThread( Server_WorkerThread, ret ); ret->WaitFlag = SDL_CreateCond(); ret->Mutex = SDL_CreateMutex(); SDL_mutexP( ret->Mutex ); + ret->WorkerThread = SDL_CreateThread( Server_WorkerThread, ret ); } } diff --git a/AcessNative/acesskernel_src/threads.c b/AcessNative/acesskernel_src/threads.c index e436836c..5a0ce131 100644 --- a/AcessNative/acesskernel_src/threads.c +++ b/AcessNative/acesskernel_src/threads.c @@ -7,7 +7,7 @@ */ #define _SIGNAL_H_ #undef CLONE_VM // Such a hack -#include +#include #include #include #include -- 2.20.1