git.ucc.asn.au
/
tpg
/
acess2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fe2794b
)
AcessNative - Compile fixes after select() implementation
author
John Hodge
<
[email protected]
>
Tue, 1 Mar 2011 06:32:44 +0000
(14:32 +0800)
committer
John Hodge
<
[email protected]
>
Tue, 1 Mar 2011 06:32:44 +0000
(14:32 +0800)
AcessNative/acesskernel_src/helpers.c
patch
|
blob
|
history
AcessNative/acesskernel_src/include/arch.h
patch
|
blob
|
history
AcessNative/acesskernel_src/server.c
patch
|
blob
|
history
AcessNative/acesskernel_src/threads.c
patch
|
blob
|
history
diff --git
a/AcessNative/acesskernel_src/helpers.c
b/AcessNative/acesskernel_src/helpers.c
index
ef5f1db
..
e598ef1
100644
(file)
--- a/
AcessNative/acesskernel_src/helpers.c
+++ b/
AcessNative/acesskernel_src/helpers.c
@@
-4,9
+4,10
@@
*
* Kernel Main
*/
-#include <a
cess
.h>
+#include <a
rch
.h>
#include <stdio.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <sys/time.h>
void LogF(const char *Fmt, ...)
diff --git
a/AcessNative/acesskernel_src/include/arch.h
b/AcessNative/acesskernel_src/include/arch.h
index
8f0eb79
..
a6685b2
100644
(file)
--- a/
AcessNative/acesskernel_src/include/arch.h
+++ b/
AcessNative/acesskernel_src/include/arch.h
@@
-4,7
+4,7
@@
#define _ARCH_H_
#include <stdint.h>
-#include <stdlib.h>
+
//
#include <stdlib.h>
#include <pthread.h>
#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
af33bfd
..
5d46f20
100644
(file)
--- 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
e436836
..
5a0ce13
100644
(file)
--- 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 <a
cess
.h>
+#include <a
rch
.h>
#include <unistd.h>
#include <sys/types.h>
#include <stdint.h>
UCC
git Repository :: git.ucc.asn.au