commit 6f94de3ca49e4ea147b1c59e5818fa175846518f
author Elliott Hughes <enh@google.com> Tue Feb 12 06:06:22 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 12 06:06:22 2013 +0000
tree 9a2c45004114f53c4cf1f9468a58fe54c58320fa
parent 2a1bb4e64677b9abbc17173c79768ed494565047

Revert "More pthreads cleanup."

This reverts commit 2a1bb4e64677b9abbc17173c79768ed494565047

Change-Id: Ia443d0748015c8e9fc3121e40e68258616767b51

libc/bionic/tmpfile.cpp

diff --git a/libc/bionic/tmpfile.cpp b/libc/bionic/tmpfile.cpp
index 8419ff5..b97cc6c 100644
--- a/libc/bionic/tmpfile.cpp
+++ b/libc/bionic/tmpfile.cpp
@@ -38,8 +38,6 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "private/ErrnoRestorer.h"
-
 class ScopedSignalBlocker {
  public:
   ScopedSignalBlocker() {
@@ -79,8 +77,9 @@
     struct stat sb;
     int rc = fstat(fd, &sb);
     if (rc == -1) {
-      ErrnoRestorer errno_restorer;
+      int old_errno = errno;
       close(fd);
+      errno = old_errno;
       return NULL;
     }
   }
@@ -92,8 +91,9 @@
   }
 
   // Failure. Clean up. We already unlinked, so we just need to close.
-  ErrnoRestorer errno_restorer;
+  int old_errno = errno;
   close(fd);
+  errno = old_errno;
   return NULL;
 }