am 206e2c05: am 333e2ae8: Merge "Add si_timerid to <signal.h>."

* commit '206e2c05f1b08a60b5706c93fbb6e53f456ae67d':
  Add si_timerid to <signal.h>.
This commit is contained in:
Elliott Hughes
2014-03-08 07:28:14 +00:00
committed by Android Git Automerger

View File

@@ -66,6 +66,8 @@ extern const char* const sys_signame[]; /* BSD compatibility. */
typedef __sighandler_t sig_t; /* BSD compatibility. */
typedef __sighandler_t sighandler_t; /* glibc compatibility. */
#define si_timerid si_tid /* glibc compatibility. */
#if defined(__LP64__)
struct sigaction {