Add id_t, a new type capable of representing a pid_t or a uid_t. Move

the definition of rlim_t to <sys/_types.h> so that it can be shared.

2 files changed, 13 insertions, 1 deletions

diff --git a/sys/sys/_types.h b/sys/sys/_types.h
index cc5338a..6e95db2 100644
--- a/sys/sys/_types.h
+++ b/sys/sys/_types.h
@@ -40,11 +40,13 @@ typedef	__uint32_t	__fflags_t;		/* file flags */
 typedef	__uint64_t	__fsblkcnt_t;
 typedef	__uint64_t	__fsfilcnt_t;
 typedef	__uint32_t	__gid_t;
+typedef	__int64_t	__id_t;			/* can hold a uid_t or pid_t */
 typedef	long		__key_t;		/* IPC key (for Sys V IPC) */
 typedef	__uint16_t	__mode_t;		/* permissions */
 typedef	int		__nl_item;
 typedef	__int64_t	__off_t;		/* file offset */
 typedef	__int32_t	__pid_t;		/* process [group] */
+typedef	__int64_t	__rlim_t;	/* resource limit (XXX not unsigned) */
 typedef	__uint8_t	__sa_family_t;
 typedef	__uint32_t	__socklen_t;
 typedef	__int32_t	__timer_t;		/* timer_gettime()... */
diff --git a/sys/sys/types.h b/sys/sys/types.h
index bd8ec13..0a56062 100644
--- a/sys/sys/types.h
+++ b/sys/sys/types.h
@@ -127,6 +127,11 @@ typedef	__gid_t		gid_t;		/* group id */
 #define	_GID_T_DECLARED
 #endif
 
+#ifndef _ID_T_DECLARED
+typedef	__id_t		id_t;		/* can hold a uid_t or pid_t */
+#define	_ID_T_DECLARED
+#endif
+
 typedef	__uint32_t	ino_t;		/* inode number */
 
 #ifndef _KEY_T_DECLARED
@@ -152,7 +157,12 @@ typedef	__pid_t		pid_t;		/* process id */
 #endif
 
 typedef	__register_t	register_t;
-typedef	__int64_t	rlim_t;		/* resource limit (XXX not unsigned) */
+
+#ifndef _RLIM_T_DECLARED
+typedef	__rlim_t	rlim_t;		/* resource limit */
+#define	_RLIM_T_DECLARED
+#endif
+
 typedef	__segsz_t	segsz_t;	/* segment size (in pages) */
 typedef	__u_register_t	u_register_t;