From f4a1f909c6649da6f4f2be4a6b2fea4de78f5de3 Mon Sep 17 00:00:00 2001
From: Mike Barcroft <mike@FreeBSD.org>
Date: Wed, 18 Sep 2002 05:51:23 +0000
Subject: [PATCH] Move definition of nl_item type to <sys/_types.h>, so that it
 can be shared.

---
 include/nl_types.h | 6 +++++-
 sys/sys/_types.h   | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/include/nl_types.h b/include/nl_types.h
index afd7f9f5f824..43eee1f2f9db 100644
--- a/include/nl_types.h
+++ b/include/nl_types.h
@@ -39,7 +39,11 @@ up-to-date.  Many thanks.
 #define	NL_SETD		0
 #define	NL_CAT_LOCALE	1
 
-typedef	int	nl_item;
+#ifndef _NL_ITEM_DECLARED
+typedef	__nl_item	nl_item;
+#define	_NL_ITEM_DECLARED
+#endif
+
 typedef	void	*nl_catd;
 
 __BEGIN_DECLS
diff --git a/sys/sys/_types.h b/sys/sys/_types.h
index fd1d942471ef..d11e9c49f829 100644
--- a/sys/sys/_types.h
+++ b/sys/sys/_types.h
@@ -41,6 +41,7 @@ typedef	__uint64_t	__fsblkcnt_t;
 typedef	__uint64_t	__fsfilcnt_t;
 typedef	__uint32_t	__gid_t;
 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	__uint8_t	__sa_family_t;