gettimeofday: port recent C++ fix to Emacs

[gnulib.git] / tests / test-closein.c

diff --git a/tests/test-closein.c b/tests/test-closein.c
index 90214e8..5f9d8ef 100644 (file)
--- a/tests/test-closein.c
+++ b/tests/test-closein.c
@@ -1,9 +1,9 @@
 /* Test of closein module.
 /* Test of closein module.

-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007-2013 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
 
    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

-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)

    any later version.
 
    This program is distributed in the hope that it will be useful,
    any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -12,8 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License

-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */

 
 /* Written by Eric Blake.  */
 
 
 /* Written by Eric Blake.  */
 


@@ -23,8 +22,10 @@
 
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <stdio.h>
 #include <stdlib.h>

+#include <unistd.h>

 
 #include "binary-io.h"
 
 #include "binary-io.h"

+#include "ignore-value.h"

 
 char *program_name;
 
 
 char *program_name;
 


@@ -35,15 +36,17 @@ int
 main (int argc, char **argv)
 {
   char buf[7];
 main (int argc, char **argv)
 {
   char buf[7];

-  int i = -1;
-  atexit(close_stdin);
+  atexit (close_stdin);

   program_name = argv[0];
 
   /* close_stdin currently relies on ftell, but mingw ftell is
      unreliable on text mode input.  */
   SET_BINARY (0);
 
   program_name = argv[0];
 
   /* close_stdin currently relies on ftell, but mingw ftell is
      unreliable on text mode input.  */
   SET_BINARY (0);
 

+  if (argc > 2)
+    close (0);
+

   if (argc > 1)
   if (argc > 1)

-    i = fread (buf, 1, 6, stdin);
+    ignore_value (fread (buf, 1, 6, stdin));

   return 0;
 }
   return 0;
 }