aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--bits/confname.h4
-rw-r--r--conform/data/unistd.h-data2
3 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8dd1c05..3992fb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-11 Ulrich Drepper <drepper@redhat.com>
+
+ * bits/confname.h: Fix typo in last change.
+
+ * conform/data/unistd.h-data: lockf-constants Not needed for POSIX.
+
2010-01-10 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/bits/sigaction.h: SA_RESTART, SA_NODEFER,
diff --git a/bits/confname.h b/bits/confname.h
index b3c33a9..9d4e006 100644
--- a/bits/confname.h
+++ b/bits/confname.h
@@ -667,11 +667,11 @@ enum
#define _CS_POSIX_V7_LPBIG_OFFBIG_LDFLAGS _CS_POSIX_V7_LPBIG_OFFBIG_LDFLAGS
_CS_POSIX_V7_LPBIG_OFFBIG_LIBS,
#define _CS_POSIX_V7_LPBIG_OFFBIG_LIBS _CS_POSIX_V7_LPBIG_OFFBIG_LIBS
- _CS_POSIX_V7_LPBIG_OFFBIG_LINTFLAGS
+ _CS_POSIX_V7_LPBIG_OFFBIG_LINTFLAGS,
#define _CS_POSIX_V7_LPBIG_OFFBIG_LINTFLAGS _CS_POSIX_V7_LPBIG_OFFBIG_LINTFLAGS
_CS_V6_ENV,
#define _CS_V6_ENV _CS_V6_ENV
- _CS_V7_ENV,
+ _CS_V7_ENV
#define _CS_V7_ENV _CS_V7_ENV
};
diff --git a/conform/data/unistd.h-data b/conform/data/unistd.h-data
index 96cdf6a..8711499 100644
--- a/conform/data/unistd.h-data
+++ b/conform/data/unistd.h-data
@@ -300,10 +300,12 @@ constant _CS_V7_ENV
constant _SC_THREAD_ROBUST_PRIO_INHERIT
constant _SC_THREAD_ROBUST_PRIO_PROTECT
+#if !defined POSIX && !defined POSIX2008
constant F_LOCK
constant F_ULOCK
constant F_TEST
constant F_TLOCK
+#endif
constant _PC_ASYNC_IO
constant _PC_CHOWN_RESTRICTED