Commit 126b2843 authored by binji@chromium.org's avatar binji@chromium.org

[NaCl SDK] Fix SDK waterfall: unistd.h does not exist on windows.

BUG=none
TBR=noelallen@chromium.org

Review URL: https://codereview.chromium.org/17234004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207878 0039d316-1c4b-4281-b951-d872f2087c98
parent 97505bd6
...@@ -257,6 +257,7 @@ include/nacl_io/osinttypes.h ...@@ -257,6 +257,7 @@ include/nacl_io/osinttypes.h
include/nacl_io/osmman.h include/nacl_io/osmman.h
include/nacl_io/osstat.h include/nacl_io/osstat.h
include/nacl_io/ostypes.h include/nacl_io/ostypes.h
include/nacl_io/osunistd.h
include/nacl_io/path.h include/nacl_io/path.h
include/nacl_io/pepper/all_interfaces.h include/nacl_io/pepper/all_interfaces.h
include/nacl_io/pepper/define_empty_macros.h include/nacl_io/pepper/define_empty_macros.h
......
...@@ -8,13 +8,9 @@ ...@@ -8,13 +8,9 @@
#include <fcntl.h> #include <fcntl.h>
#include <pthread.h> #include <pthread.h>
#ifndef WIN32
// Needed for SEEK_SET/SEEK_CUR/SEEK_END.
#include <unistd.h>
#endif
#include "nacl_io/mount.h" #include "nacl_io/mount.h"
#include "nacl_io/mount_node.h" #include "nacl_io/mount_node.h"
#include "nacl_io/osunistd.h"
// It is only legal to construct a handle while the kernel lock is held. // It is only legal to construct a handle while the kernel lock is held.
KernelHandle::KernelHandle(Mount* mnt, MountNode* node) KernelHandle::KernelHandle(Mount* mnt, MountNode* node)
......
...@@ -62,6 +62,7 @@ ...@@ -62,6 +62,7 @@
"osmman.h", "osmman.h",
"osstat.h", "osstat.h",
"ostypes.h", "ostypes.h",
"osunistd.h",
"path.h", "path.h",
"pepper_interface.h", "pepper_interface.h",
"real_pepper_interface.h", "real_pepper_interface.h",
......
...@@ -9,11 +9,11 @@ ...@@ -9,11 +9,11 @@
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <string.h> #include <string.h>
#include <unistd.h>
#include "nacl_io/kernel_wrap_real.h" #include "nacl_io/kernel_wrap_real.h"
#include "nacl_io/mount_dev.h" #include "nacl_io/mount_dev.h"
#include "nacl_io/mount_node.h" #include "nacl_io/mount_node.h"
#include "nacl_io/mount_node_dir.h" #include "nacl_io/mount_node_dir.h"
#include "nacl_io/osunistd.h"
#include "nacl_io/pepper_interface.h" #include "nacl_io/pepper_interface.h"
#include "sdk_util/auto_lock.h" #include "sdk_util/auto_lock.h"
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
#include <string.h> #include <string.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h>
#include <vector> #include <vector>
...@@ -22,6 +21,7 @@ ...@@ -22,6 +21,7 @@
#include "nacl_io/mount_node_dir.h" #include "nacl_io/mount_node_dir.h"
#include "nacl_io/mount_node_http.h" #include "nacl_io/mount_node_http.h"
#include "nacl_io/osinttypes.h" #include "nacl_io/osinttypes.h"
#include "nacl_io/osunistd.h"
#include "sdk_util/auto_lock.h" #include "sdk_util/auto_lock.h"
namespace { namespace {
......
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h>
#include <string> #include <string>
...@@ -15,6 +14,7 @@ ...@@ -15,6 +14,7 @@
#include "nacl_io/mount_node_dir.h" #include "nacl_io/mount_node_dir.h"
#include "nacl_io/mount_node_mem.h" #include "nacl_io/mount_node_mem.h"
#include "nacl_io/osstat.h" #include "nacl_io/osstat.h"
#include "nacl_io/osunistd.h"
#include "nacl_io/path.h" #include "nacl_io/path.h"
#include "sdk_util/auto_lock.h" #include "sdk_util/auto_lock.h"
#include "sdk_util/ref_object.h" #include "sdk_util/ref_object.h"
......
/* Copyright (c) 2013 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.
*/
#ifndef LIBRARIES_NACL_IO_OSUNISTD_H_
#define LIBRARIES_NACL_IO_OSUNISTD_H_
#if defined(WIN32)
#define R_OK 4
#define W_OK 2
#define X_OK 1
#define F_OK 0
#else
#include <unistd.h>
#endif
#endif // LIBRARIES_NACL_IO_OSUNISTD_H_
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment