From: John Hodge <tpg@mutabah.net>
Date: Mon, 17 Sep 2012 01:42:29 +0000 (+0800)
Subject: Merge branch 'master' of github.com:thepowersgang/acess2
X-Git-Tag: rel0.15~706^2~3^2
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=e7809e57b0692cf65ee1a7d2060c52fc53da49f2;p=tpg%2Facess2.git

Merge branch 'master' of github.com:thepowersgang/acess2
---

e7809e57b0692cf65ee1a7d2060c52fc53da49f2
diff --cc Usermode/Libraries/ld-acess.so_src/include_exp/unistd.h
index 2705bca1,a20a2042..e1fee2e8
--- a/Usermode/Libraries/ld-acess.so_src/include_exp/unistd.h
+++ b/Usermode/Libraries/ld-acess.so_src/include_exp/unistd.h
@@@ -5,12 -5,8 +5,12 @@@
  #define O_WR	(OPENFLAG_WRITE)
  #define O_RD	(OPENFLAG_READ)
  #define O_CREAT	(OPENFLAG_CREATE)
 +#define O_RDONLY	OPENFLAG_READ
 +#define O_WRONLY	OPENFLAG_WRITE
 +#define O_TRUNC	OPENFLAG_TRUNCATE
 +#define O_APPEND	OPENFLAG_APPEND
  
- typedef intptr_t	ssize_t;
+ //typedef intptr_t	ssize_t;
  
  #include "acess/sys.h"