diff options
| author | Austin Foxley <austinf@cetoncorp.com> | 2009-11-22 11:46:31 -0800 |
|---|---|---|
| committer | Austin Foxley <austinf@cetoncorp.com> | 2009-11-22 11:51:37 -0800 |
| commit | f757db2d319ccc5f7034165046fb2bb58901afb1 (patch) | |
| tree | 7dc465febb3a802d3f0e8856fcda856b13b04c0a /include/nl_types.h | |
| parent | 76c0c0ed99f74b8a5965be6e1c6a0c0e7a72513c (diff) | |
| parent | b71274eebd68b7c68ab95c856f8075bdf4524cd7 (diff) | |
Merge remote branch 'origin/master' into nptl_merge
Conflicts:
Rules.mak
libc/misc/sysvipc/msgq.c
test/Rules.mak
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'include/nl_types.h')
| -rw-r--r-- | include/nl_types.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/nl_types.h b/include/nl_types.h index 74e762113..d6d48ecd9 100644 --- a/include/nl_types.h +++ b/include/nl_types.h @@ -40,6 +40,7 @@ typedef void *nl_catd; /* Type used by `nl_langinfo'. */ typedef int nl_item; +#if 0 /* Open message catalog for later use, returning descriptor. This function is a possible cancellation point and therefore not @@ -53,6 +54,7 @@ extern char *catgets (nl_catd __catalog, int __set, int __number, /* Close message CATALOG. */ extern int catclose (nl_catd __catalog) __THROW __nonnull ((1)); +#endif __END_DECLS |