summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@redhat.com>2010-01-11 10:31:49 +0100
committerAndreas Schwab <schwab@redhat.com>2010-01-11 10:31:49 +0100
commitc14a0516dbea2e1b794f9a09a8ea182fbe0dc349 (patch)
treeaea6ef619b1bb3ee704d5904f8209c33933c4822 /include
parenta5683508bcdcfcbe8e486cbcdcaa3830d9ab22e8 (diff)
parent33780b6d332af9d94216eff880734be7748c2269 (diff)
Merge remote branch 'origin/master' into fedora/master
Diffstat (limited to 'include')
-rw-r--r--include/features.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/include/features.h b/include/features.h
index 774ff22206..c61e373498 100644
--- a/include/features.h
+++ b/include/features.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1993,1995-2006,2007,2009 Free Software Foundation, Inc.
+/* Copyright (C) 1991-1993,1995-2007,2009,2010 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -66,7 +66,8 @@
__USE_XOPEN_EXTENDED Define X/Open Unix things.
__USE_UNIX98 Define Single Unix V2 things.
__USE_XOPEN2K Define XPG6 things.
- __USE_XOPEN2K8 Define XPG7 things.
+ __USE_XOPEN2KXSI Define XPG6 XSI things.
+ __USE_XOPEN2K8XSI Define XPG7 XSI things.
__USE_LARGEFILE Define correct standard I/O things.
__USE_LARGEFILE64 Define LFS things with separate names.
__USE_FILE_OFFSET64 Define 64bit interface as default.
@@ -102,7 +103,9 @@
#undef __USE_XOPEN_EXTENDED
#undef __USE_UNIX98
#undef __USE_XOPEN2K
+#undef __USE_XOPEN2KXSI
#undef __USE_XOPEN2K8
+#undef __USE_XOPEN2K8XSI
#undef __USE_LARGEFILE
#undef __USE_LARGEFILE64
#undef __USE_FILE_OFFSET64
@@ -250,8 +253,10 @@
# if (_XOPEN_SOURCE - 0) >= 600
# if (_XOPEN_SOURCE - 0) >= 700
# define __USE_XOPEN2K8 1
+# define __USE_XOPEN2K8XSI 1
# endif
# define __USE_XOPEN2K 1
+# define __USE_XOPEN2KXSI 1
# undef __USE_ISOC99
# define __USE_ISOC99 1
# endif