From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 26 Jan 2001 08:54:05 +0000 (+0000)
Subject: Update.
X-Git-Tag: upstream/2.20~16734
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1e4380f8fca21ff6ad1db1ad9bc2f7eb92fe6520;p=platform%2Fupstream%2Flinaro-glibc.git

Update.

	* io/sys/stat.h: Define S_IFSOCK for XPG6.

	* conform/data/fcntl.h-data: posix_madvise is not expected here.
---

diff --git a/ChangeLog b/ChangeLog
index 5a8a2ce..f1cde18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2001-01-26  Ulrich Drepper  <drepper@redhat.com>
 
+	* io/sys/stat.h: Define S_IFSOCK for XPG6.
+
+	* conform/data/fcntl.h-data: posix_madvise is not expected here.
+
 	* conform/conformtest.pl: Fix handling of macro-str.
 
 	* conform/data/inttypes.h-data: Add missing definition and all of
diff --git a/conform/data/fcntl.h-data b/conform/data/fcntl.h-data
index 5771af6..ba857c9 100644
--- a/conform/data/fcntl.h-data
+++ b/conform/data/fcntl.h-data
@@ -18,7 +18,7 @@ constant F_WRLCK
 
 constant SEEK_SET
 constant SEEK_CUR
-constant SEED_END
+constant SEEK_END
 
 constant O_CREAT
 constant O_EXCL
@@ -89,7 +89,6 @@ function int open (const char*, int, ...)
 #ifdef XOPEN2K
 function int posix_fadvise (int, off_t, size_t, int)
 function int posix_fallocate (int, off_t, size_t)
-function int posix_madvise (void*, size_t, int)
 #endif
 
 allow-header sys/stat.h
diff --git a/io/sys/stat.h b/io/sys/stat.h
index 32268a0..a416880 100644
--- a/io/sys/stat.h
+++ b/io/sys/stat.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 92, 1995-1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 1995-1999, 2000, 2001 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
@@ -109,7 +109,8 @@ __BEGIN_DECLS
 # ifdef __S_IFLNK
 #  define S_IFLNK	__S_IFLNK
 # endif
-# if (defined __USE_BSD || defined __USE_MISC) && defined __S_IFSOCK
+# if (defined __USE_BSD || defined __USE_MISC || defined __USE_XOPEN2K) \
+     && defined __S_IFSOCK
 #  define S_IFSOCK	__S_IFSOCK
 # endif
 #endif