[apple/libc.git] / include / FreeBSD / nl_types.h.patch

--- nl_types.h.orig	2010-10-29 00:51:39.000000000 -0700
+++ nl_types.h	2010-10-29 00:53:25.000000000 -0700
@@ -43,6 +43,7 @@
 
 #include <sys/cdefs.h>
 #include <sys/types.h>
+#include <_types.h>
 
 #ifdef _NLS_PRIVATE
 /*
@@ -82,7 +83,7 @@
 
 #endif	/* _NLS_PRIVATE */
 
-#define	NL_SETD		0
+#define	NL_SETD		1
 #define	NL_CAT_LOCALE	1
 
 typedef struct __nl_cat_d {
@@ -90,9 +91,9 @@
 	int	__size;
 } *nl_catd;
 
-#ifndef _NL_ITEM_DECLARED
-typedef	__nl_item	nl_item;
-#define	_NL_ITEM_DECLARED
+#ifndef _NL_ITEM
+typedef __darwin_nl_item        nl_item;
+#define _NL_ITEM
 #endif
 
 __BEGIN_DECLS
Commit	Line	Data
1f2f436a A	1	--- nl_types.h.orig 2010-10-29 00:51:39.000000000 -0700
	2	+++ nl_types.h 2010-10-29 00:53:25.000000000 -0700
	3	@@ -43,6 +43,7 @@
	4
	5	#include <sys/cdefs.h>
	6	#include <sys/types.h>
	7	+#include <_types.h>
	8
	9	#ifdef _NLS_PRIVATE
	10	/*
	11	@@ -82,7 +83,7 @@
	12
	13	#endif /* _NLS_PRIVATE */
	14
	15	-#define NL_SETD 0
	16	+#define NL_SETD 1
	17	#define NL_CAT_LOCALE 1
	18
	19	typedef struct __nl_cat_d {
	20	@@ -90,9 +91,9 @@
	21	int __size;
	22	} *nl_catd;
	23
	24	-#ifndef _NL_ITEM_DECLARED
	25	-typedef __nl_item nl_item;
	26	-#define _NL_ITEM_DECLARED
	27	+#ifndef _NL_ITEM
	28	+typedef __darwin_nl_item nl_item;
	29	+#define _NL_ITEM
	30	#endif
	31
	32	__BEGIN_DECLS