From: John Hodge (sonata) <tpg@mutabah.net>
Date: Wed, 15 May 2013 08:13:53 +0000 (+0800)
Subject: Merge branch 'master' of ssh.ucc.asn.au:tpg/acess2
X-Git-Tag: rel0.15~479
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=fe07801ccb8de442c9fc665cd1706faa0f12c166;hp=b60e6b273c3ecb1614d937bf9448033e9d339e83;p=tpg%2Facess2.git

Merge branch 'master' of ssh.ucc.asn.au:tpg/acess2
---

diff --git a/KernelLand/Kernel/drv/zero-one.c b/KernelLand/Kernel/drv/zero-one.c
index fd14ed1b..e7d3892f 100644
--- a/KernelLand/Kernel/drv/zero-one.c
+++ b/KernelLand/Kernel/drv/zero-one.c
@@ -75,7 +75,8 @@ tDevFS_Driver	gCoreDevs_FRandom = {
 	{
 	.Size = 0, .NumACLs = 1,
 	.ACLs = &gVFS_ACL_EveryoneRW,
-	.Type = &gCoreDevs_NT_FRandom
+	.Type = &gCoreDevs_NT_FRandom,
+	.DataAvaliable = 1
 	}
 };
 tDevFS_Driver	gCoreDevs_GRandom = {
@@ -83,7 +84,8 @@ tDevFS_Driver	gCoreDevs_GRandom = {
 	{
 	.Size = 0, .NumACLs = 1,
 	.ACLs = &gVFS_ACL_EveryoneRW,
-	.Type = &gCoreDevs_NT_GRandom
+	.Type = &gCoreDevs_NT_GRandom,
+	.DataAvaliable = 1
 	}
 };
 
diff --git a/Usermode/Libraries/libposix.so_src/include_exp/sys/stat.h b/Usermode/Libraries/libposix.so_src/include_exp/sys/stat.h
index be5ceb34..0340a9fc 100644
--- a/Usermode/Libraries/libposix.so_src/include_exp/sys/stat.h
+++ b/Usermode/Libraries/libposix.so_src/include_exp/sys/stat.h
@@ -18,13 +18,6 @@ typedef uint64_t	blkcnt_t;
 typedef unsigned int	nlink_t;
 typedef uint32_t	mode_t;
 
-#ifndef uid_t
-typedef uint32_t	uid_t;
-#endif
-#ifndef gid_t
-typedef uint32_t	gid_t;
-#endif
-
 #define	S_IFMT		0170000	/* type of file */
 #define		S_IFDIR	0040000	/* directory */
 #define		S_IFCHR	0020000	/* character special */