Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(453)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/common/nacl_types.h

Issue 6995121: New NaCl zygote implementation 2 (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Fixing includes for Windows bots Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/nacl_helper_linux.h ('k') | chrome/nacl.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/nacl_types.h
diff --git a/chrome/common/nacl_types.h b/chrome/common/nacl_types.h
index b61d9eff925e2a72b8c5e8c00bee024fbb3d03e4..3d77e2f706f41e508e8c333039861cf85859bd8d 100644
--- a/chrome/common/nacl_types.h
+++ b/chrome/common/nacl_types.h
@@ -7,6 +7,7 @@
#define CHROME_COMMON_NACL_TYPES_H_
#pragma once
+#include "base/native_library.h" // for HANDLE and OS_POSIX
#if defined(OS_POSIX)
#include "base/file_descriptor_posix.h"
#endif
@@ -19,7 +20,8 @@ namespace nacl {
inline HANDLE ToNativeHandle(const FileDescriptor& desc) {
return reinterpret_cast<HANDLE>(desc);
}
-#elif defined(OS_POSIX)
+#endif
+#if defined(OS_POSIX)
typedef base::FileDescriptor FileDescriptor;
inline int ToNativeHandle(const FileDescriptor& desc) {
return desc.fd;
« no previous file with comments | « chrome/common/nacl_helper_linux.h ('k') | chrome/nacl.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698