X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Kernel%2Finclude%2Fvfs_ext.h;h=a56d45578bbe1c6a5ea41d6be68ae99d5e9a6987;hb=89a520c7cbe3ad16aaab21a46475fae0c604ab15;hp=e8cd24204318c5918c3044b1de70df6ec56b6382;hpb=a173ab5b104f596bfe2f4df85de541c2c4583ba7;p=tpg%2Facess2.git diff --git a/Kernel/include/vfs_ext.h b/Kernel/include/vfs_ext.h index e8cd2420..a56d4557 100644 --- a/Kernel/include/vfs_ext.h +++ b/Kernel/include/vfs_ext.h @@ -118,7 +118,7 @@ typedef struct sVFS_ACL unsigned Inv: 1; //!< Invert Permissions unsigned Perms: 31; //!< Permission Flags }; -} tVFS_ACL; +} tVFS_ACL; /** * \brief SYS_FINFO structure @@ -136,7 +136,7 @@ typedef struct sFInfo Sint64 ctime; //!< Creation time Sint32 numacls; //!< Total number of ACL entries tVFS_ACL acls[]; //!< ACL buffer (size is passed in the \a MaxACLs argument to VFS_FInfo) -} tFInfo; +} PACKED tFInfo; /** * \brief fd_set for select() @@ -353,10 +353,11 @@ extern int VFS_ReadDir(int FD, char *Dest); * \param WriteHandles Handles to wait to write to * \param ErrHandles Handle to wait for errors on * \param Timeout Timeout for select() (if null, there is no timeout), if zero select() is non blocking + * \param ExtraEvents Extra event set to wait on * \param IsKernel Use kernel handles as opposed to user handles * \return Number of handles that actioned */ -extern int VFS_Select(int MaxHandle, fd_set *ReadHandles, fd_set *WriteHandles, fd_set *ErrHandles, tTime *Timeout, BOOL IsKernel); +extern int VFS_Select(int MaxHandle, fd_set *ReadHandles, fd_set *WriteHandles, fd_set *ErrHandles, tTime *Timeout, Uint32 ExtraEvents, BOOL IsKernel); /** * \brief Map a file into memory