commit cb478f23cc3765e3193beaf83fb35dd2d353d301
author Elliott Hughes <enh@google.com> Thu Nov 21 09:07:15 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Nov 21 09:07:15 2013 -0800
tree 927354f43454b2196ec2a676c22537492da0ff99
parent a18a01f553ce5350923c470c144dca87dfc8e992
parent d4143c8e4cd8b006d8f422883b53684881e0991a

am d4143c8e: Merge "Fix useconds_t for LP64."

* commit 'd4143c8e4cd8b006d8f422883b53684881e0991a':
  Fix useconds_t for LP64.

libc/include/sys/types.h

diff --git a/libc/include/sys/types.h b/libc/include/sys/types.h
index d793f81..978393c 100644
--- a/libc/include/sys/types.h
+++ b/libc/include/sys/types.h
@@ -98,7 +98,7 @@
 typedef __kernel_time_t time_t;
 
 typedef __kernel_suseconds_t suseconds_t;
-typedef unsigned long useconds_t;
+typedef unsigned int useconds_t;
 
 typedef __kernel_daddr_t	daddr_t;
 typedef __kernel_timer_t	timer_t;