Re: snapshot in preparation for 1.4.13

[Eric Blake]

Eric Blake <ebb9 <at> byu.net> writes:

> > Meanwhile, I will be working on a gnulib patch that fixes
> > unistd.h to provide STD{IN,OUT,ERR}_FILENO (gnulib has several files that
> > do ad-hoc definition of these constants, but we might as well provide it
> > for free in our replacement header).
> 
> I'm applying this:

And this followup.


From: Eric Blake <address@hidden>
Date: Mon, 19 Jan 2009 09:37:19 -0700
Subject: [PATCH] test-unistd: test previous patch

* tests/test-unistd.c: Test *_FILENO macros.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog           |    3 +++
 tests/test-unistd.c |    8 +++++++-
 2 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 22ad726..296d20d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-01-19  Eric Blake  <address@hidden>
 
+       test-unistd: test previous patch
+       * tests/test-unistd.c: Test *_FILENO macros.
+
        unistd: guarantee STDIN_FILENO here, for OS/2 EMX
        * lib/unistd.in.h (STDIN_FILENO, STDOUT_FILENO, STDERR_FILENO):
        Guarantee a definition.
diff --git a/tests/test-unistd.c b/tests/test-unistd.c
index dc15bda..6cd5d00 100644
--- a/tests/test-unistd.c
+++ b/tests/test-unistd.c
@@ -1,5 +1,5 @@
 /* Test of <unistd.h> substitute.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,6 +23,12 @@
 /* Check that the various SEEK_* macros are defined.  */
 int sk[] = { SEEK_CUR, SEEK_END, SEEK_SET };
 
+/* Check that the various *_FILENO macros are defined.  */
+#if ! (defined STDIN_FILENO                                     \
+       && (STDIN_FILENO + STDOUT_FILENO + STDERR_FILENO == 3))
+missing or broken *_FILENO macros
+#endif
+
 /* Check that the types are all defined.  */
 size_t t1;
 ssize_t t2;
-- 
1.6.0.4