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/dirent.cpp

diff --git a/libc/bionic/dirent.cpp b/libc/bionic/dirent.cpp
index 74297d8..3a7b5b4 100644
--- a/libc/bionic/dirent.cpp
+++ b/libc/bionic/dirent.cpp
@@ -36,8 +36,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "private/ErrnoRestorer.h"
-#include "private/ScopedPthreadMutexLocker.h"
+#include <private/ScopedPthreadMutexLocker.h>
 
 struct DIR {
   int fd_;
@@ -109,7 +108,7 @@
 }
 
 int readdir_r(DIR* d, dirent* entry, dirent** result) {
-  ErrnoRestorer errno_restorer;
+  int saved_errno = errno;
 
   *result = NULL;
   errno = 0;
@@ -125,6 +124,7 @@
     memcpy(entry, next, next->d_reclen);
     *result = entry;
   }
+  errno = saved_errno;
   return 0;
 }