[NaCl SDK] Get nacl_mounts_tests building.

native_client_sdk/src/libraries/nacl_mounts_test/mount_node_test.cc

 /* Copyright (c) 2012 The Chromium Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include <errno.h>
 #include <fcntl.h>
-#include <unistd.h>
 
 #include "nacl_mounts/kernel_proxy.h"
 #include "nacl_mounts/mount_node.h"
 #include "nacl_mounts/mount_node_dir.h"
 #include "nacl_mounts/mount_node_mem.h"
+#include "nacl_mounts/osdirent.h"
 
-#define __STDC__ 1
 #include "gtest/gtest.h"
 
 #define NULL_NODE ((MountNode *) NULL)
 
 static int s_AllocNum = 0;
 
 class MockMemory : public MountNodeMem {
  public:
   MockMemory() : MountNodeMem(NULL, 0, 0) {
     s_AllocNum++;
@@ skipping 46 matching lines @@
 };
 
 TEST(MountNodeTest, File) {
   MockMemory *file = new MockMemory;
 
   EXPECT_EQ(true, file->Init(S_IREAD | S_IWRITE));
 
   // Test properties
   EXPECT_EQ(0, file->GetLinks());
   EXPECT_EQ(S_IREAD | S_IWRITE, file->GetMode());
-  EXPECT_EQ(_S_IFREG, file->GetType());
+  EXPECT_EQ(S_IFREG, file->GetType());
   EXPECT_EQ(false, file->IsaDir());
   EXPECT_EQ(true, file->IsaFile());
   EXPECT_EQ(false, file->IsaTTY());
   EXPECT_EQ(1, file->RefCount());
 
   // Test IO
   char buf1[1024];
   char buf2[1024 * 2];
-  for (int a=0; a < sizeof(buf1); a++)
+  for (size_t a = 0; a < sizeof(buf1); a++)
     buf1[a] = a;
   memset(buf2, 0, sizeof(buf2));
 
   EXPECT_EQ(0, file->GetSize());
   EXPECT_EQ(0, file->Read(0, buf2, sizeof(buf2)));
   EXPECT_EQ(0, file->GetSize());
   EXPECT_EQ(sizeof(buf1), file->Write(0, buf1, sizeof(buf1)));
   EXPECT_EQ(sizeof(buf1), file->GetSize());
   EXPECT_EQ(sizeof(buf1), file->Read(0, buf2, sizeof(buf2)));
   EXPECT_EQ(0, memcmp(buf1, buf2, sizeof(buf1)));
@@ skipping 16 matching lines @@
   delete file;
 }
 
 TEST(MountNodeTest, Directory) {
   MockDir *root = new MockDir();
   root->Init(S_IREAD | S_IWRITE);
 
   // Test properties
   EXPECT_EQ(0, root->GetLinks());
   EXPECT_EQ(S_IREAD | S_IWRITE, root->GetMode());
-  EXPECT_EQ(_S_IFDIR, root->GetType());
+  EXPECT_EQ(S_IFDIR, root->GetType());
   EXPECT_EQ(true, root->IsaDir());
   EXPECT_EQ(false, root->IsaFile());
   EXPECT_EQ(false, root->IsaTTY());
   EXPECT_EQ(1, root->RefCount());
 
   // IO operations should fail
   char buf1[1024];
   EXPECT_EQ(0, root->GetSize());
   EXPECT_EQ(-1, root->Read(0, buf1, sizeof(buf1)));
   EXPECT_EQ(errno, EISDIR);
@@ skipping 37 matching lines @@
   EXPECT_EQ(0, file->GetLinks());
   EXPECT_EQ(1, file->RefCount());
   EXPECT_EQ(2, s_AllocNum);
 
   file->Release();
   EXPECT_EQ(1, s_AllocNum);
   root->Release();
   EXPECT_EQ(0, s_AllocNum);
 }