commit 57dbb2cb3767c625cfc8d15406b2c4d6b53bb7c6
author Andy McFadden <fadden@android.com> Thu Jul 01 09:05:51 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 01 09:05:51 2010 -0700
tree 0cb479fb3215bc7e7ac2c79fa4cf350e17a9d8a5
parent cc4d11c245d5b514ba758cc095a59cd481c92cae
parent 8e9d5c972e3eda8d1b7b9a62cd6e8a324286cfe9

Merge "Add a HAVE define for pthread_setname_np()." into gingerbread

fastboot/usb_linux.c

diff --git a/fastboot/usb_linux.c b/fastboot/usb_linux.c
index 2ce53eb..78b7b98 100644
--- a/fastboot/usb_linux.c
+++ b/fastboot/usb_linux.c
@@ -137,6 +137,7 @@
         ctrl.wIndex = 0;
         ctrl.wLength = sizeof(buffer);
         ctrl.data = buffer;
+	ctrl.timeout = 50;
 
         result = ioctl(fd, USBDEVFS_CONTROL, &ctrl);
         if (result > 0) {

include/cutils/ashmem.h

diff --git a/include/cutils/ashmem.h b/include/cutils/ashmem.h
index fd56dbe..25b233e 100644
--- a/include/cutils/ashmem.h
+++ b/include/cutils/ashmem.h
@@ -10,7 +10,7 @@
 #ifndef _CUTILS_ASHMEM_H
 #define _CUTILS_ASHMEM_H
 
-#include <stdint.h>
+#include <stddef.h>
 
 #ifdef __cplusplus
 extern "C" {