gettimeofday: port recent C++ fix to Emacs

[gnulib.git] / lib / tmpfile-safer.c

diff --git a/lib/tmpfile-safer.c b/lib/tmpfile-safer.c
index eec401a..2320f5d 100644 (file)
--- a/lib/tmpfile-safer.c
+++ b/lib/tmpfile-safer.c
@@ -1,5 +1,5 @@
 /* Invoke tmpfile, but avoid some glitches.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-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
@@ -26,10 +26,6 @@
 
 #include "binary-io.h"
 
-#ifndef STDERR_FILENO
-# define STDERR_FILENO 2
-#endif
-
 /* Like tmpfile, but do not return stdin, stdout, or stderr.
 
    Remember that tmpfile can leave files behind if your program calls _exit,
@@ -45,28 +41,28 @@ tmpfile_safer (void)
       int fd = fileno (fp);
 
       if (0 <= fd && fd <= STDERR_FILENO)
-       {
-         int f = dup_safer (fd);
-
-         if (f < 0)
-           {
-             int e = errno;
-             fclose (fp);
-             errno = e;
-             return NULL;
-           }
-
-         /* Keep the temporary file in binary mode, on platforms
-            where that matters.  */
-         if (fclose (fp) != 0
-             || ! (fp = fdopen (f, O_BINARY ? "wb+" : "w+")))
-           {
-             int e = errno;
-             close (f);
-             errno = e;
-             return NULL;
-           }
-       }
+        {
+          int f = dup_safer (fd);
+
+          if (f < 0)
+            {
+              int e = errno;
+              fclose (fp);
+              errno = e;
+              return NULL;
+            }
+
+          /* Keep the temporary file in binary mode, on platforms
+             where that matters.  */
+          if (fclose (fp) != 0
+              || ! (fp = fdopen (f, O_BINARY ? "wb+" : "w+")))
+            {
+              int e = errno;
+              close (f);
+              errno = e;
+              return NULL;
+            }
+        }
     }
 
   return fp;