From: Ulrich Drepper <drepper@redhat.com>
Date: Sun, 27 Aug 2000 18:28:09 +0000 (+0000)
Subject: Update.
X-Git-Tag: upstream/2.30~24687
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b4f48b41b478c9344ab81bfb82785b5736e6aafc;p=external%2Fglibc.git

Update.

	* posix/annexc.c: Correct test for unavailable feature.
---

diff --git a/ChangeLog b/ChangeLog
index d9c1a71..459e97f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2000-08-27  Ulrich Drepper  <drepper@redhat.com>
 
+	* posix/annexc.c: Correct test for unavailable feature.
+
 	* sysdeps/unix/sysv/linux/i386/sys/io.h (outw): Fix __INLINE ->
 	__inline.
 
diff --git a/posix/annexc.c b/posix/annexc.c
index e9e1ac9..1dbc3f6 100644
--- a/posix/annexc.c
+++ b/posix/annexc.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 2000 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
@@ -618,7 +618,7 @@ echo \"#include <%s>\" |\
 -isystem `%s --print-prog-name=include` - > %s";
 
 static const char testfmt[] = "\
-echo \"#include <unistd.h>\n#ifndef %s\n#error not defined\n#endif\n\" |\
+echo \"#include <unistd.h>\n#if !defined %s || %s == -1\n#error not defined\n#endif\n\" |\
 %s -E -dM -D_POSIX_SOURCE -D_LIBC %s \
 -isystem `%s --print-prog-name=include` - 2> /dev/null > %s";
 
@@ -814,7 +814,8 @@ check_header (const struct header *header, const char **except)
   /* First see whether this subset is supported at all.  */
   if (header->subset != NULL)
     {
-      sprintf (line, testfmt, header->subset, CC, INC, CC, TMPFILE);
+      sprintf (line, testfmt, header->subset, header->subset, CC, INC, CC,
+	       TMPFILE);
       if (xsystem (line))
 	{
 	  printf ("!! not available\n");