Don't include <stdint.h> from within <machine/_types.h>

src/trusted/service_runtime/include/machine/_types.h

Index: src/trusted/service_runtime/include/machine/_types.h
diff --git a/src/trusted/service_runtime/include/machine/_types.h b/src/trusted/service_runtime/include/machine/_types.h
index d555330ebcc39a7bb0e61131638126342fe3cd24..6ba691ca7cd435d2510de8fa988832150cbd054e 100644
--- a/src/trusted/service_runtime/include/machine/_types.h
+++ b/src/trusted/service_runtime/include/machine/_types.h
@@ -13,7 +13,6 @@
 #define NATIVE_CLIENT_SRC_TRUSTED_SERVICE_RUNTIME_INCLUDE_MACHINE__TYPES_H_
 
 #if defined(NACL_IN_TOOLCHAIN_HEADERS)
-# include <stdint.h>
 # include <machine/_default_types.h>
 #else
 # include "native_client/src/include/portability.h"
@@ -28,7 +27,7 @@
 
 #ifndef nacl_abi___dev_t_defined
 #define nacl_abi___dev_t_defined
-typedef int64_t nacl_abi___dev_t;
+typedef __int64_t nacl_abi___dev_t;
 #if !defined(NACL_IN_TOOLCHAIN_HEADERS)
 typedef nacl_abi___dev_t nacl_abi_dev_t;
 #endif
@@ -36,7 +35,7 @@ typedef nacl_abi___dev_t nacl_abi_dev_t;
 
 #ifndef nacl_abi___ino_t_defined
 #define nacl_abi___ino_t_defined
-typedef uint64_t nacl_abi___ino_t;
+typedef __uint64_t nacl_abi___ino_t;
 #if !defined(NACL_IN_TOOLCHAIN_HEADERS)
 typedef nacl_abi___ino_t nacl_abi_ino_t;
 #endif
@@ -44,7 +43,7 @@ typedef nacl_abi___ino_t nacl_abi_ino_t;
 
 #ifndef nacl_abi___mode_t_defined
 #define nacl_abi___mode_t_defined
-typedef uint32_t nacl_abi___mode_t;
+typedef __uint32_t nacl_abi___mode_t;
 #if !defined(NACL_IN_TOOLCHAIN_HEADERS)
 typedef nacl_abi___mode_t nacl_abi_mode_t;
 #endif
@@ -52,7 +51,7 @@ typedef nacl_abi___mode_t nacl_abi_mode_t;
 
 #ifndef nacl_abi___nlink_t_defined
 #define nacl_abi___nlink_t_defined
-typedef uint32_t nacl_abi___nlink_t;
+typedef __uint32_t nacl_abi___nlink_t;
 #if !defined(NACL_IN_TOOLCHAIN_HEADERS)
 typedef nacl_abi___nlink_t nacl_abi_nlink_t;
 #endif
@@ -60,7 +59,7 @@ typedef nacl_abi___nlink_t nacl_abi_nlink_t;
 
 #ifndef nacl_abi___uid_t_defined
 #define nacl_abi___uid_t_defined
-typedef uint32_t nacl_abi___uid_t;
+typedef __uint32_t nacl_abi___uid_t;
 #if !defined(NACL_IN_TOOLCHAIN_HEADERS)
 typedef nacl_abi___uid_t nacl_abi_uid_t;
 #endif
@@ -68,7 +67,7 @@ typedef nacl_abi___uid_t nacl_abi_uid_t;
 
 #ifndef nacl_abi___gid_t_defined
 #define nacl_abi___gid_t_defined
-typedef uint32_t nacl_abi___gid_t;
+typedef __uint32_t nacl_abi___gid_t;
 #if !defined(NACL_IN_TOOLCHAIN_HEADERS)
 typedef nacl_abi___gid_t nacl_abi_gid_t;
 #endif
@@ -76,7 +75,7 @@ typedef nacl_abi___gid_t nacl_abi_gid_t;
 
 #ifndef nacl_abi___off_t_defined
 #define nacl_abi___off_t_defined
-typedef int64_t nacl_abi__off_t;
+typedef __int64_t nacl_abi__off_t;
 #if !defined(NACL_IN_TOOLCHAIN_HEADERS)
 typedef nacl_abi__off_t nacl_abi_off_t;
 #endif
@@ -84,7 +83,7 @@ typedef nacl_abi__off_t nacl_abi_off_t;
 
 #ifndef nacl_abi___off64_t_defined
 #define nacl_abi___off64_t_defined
-typedef int64_t nacl_abi__off64_t;
+typedef __int64_t nacl_abi__off64_t;
 #if !defined(NACL_IN_TOOLCHAIN_HEADERS)
 typedef nacl_abi__off64_t nacl_abi_off64_t;
 #endif
@@ -92,19 +91,19 @@ typedef nacl_abi__off64_t nacl_abi_off64_t;
 
 #ifndef nacl_abi___blksize_t_defined
 #define nacl_abi___blksize_t_defined
-typedef int32_t nacl_abi___blksize_t;
+typedef __int32_t nacl_abi___blksize_t;
 typedef nacl_abi___blksize_t nacl_abi_blksize_t;
 #endif
 
 #ifndef nacl_abi___blkcnt_t_defined
 #define nacl_abi___blkcnt_t_defined
-typedef int32_t nacl_abi___blkcnt_t;
+typedef __int32_t nacl_abi___blkcnt_t;
 typedef nacl_abi___blkcnt_t nacl_abi_blkcnt_t;
 #endif
 
 #ifndef nacl_abi___time_t_defined
 #define nacl_abi___time_t_defined
-typedef int64_t       nacl_abi___time_t;
+typedef __int64_t       nacl_abi___time_t;
 typedef nacl_abi___time_t nacl_abi_time_t;
 #endif
 
@@ -115,7 +114,7 @@ struct nacl_abi_timespec {
 #if defined(NACL_IN_TOOLCHAIN_HEADERS)
   long int        tv_nsec;
 #else
-  int32_t         tv_nsec;
+  __int32_t         tv_nsec;
 #endif
 };
 #endif