generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 99a38fcf: am 486c8616: Merge "Prepare to switch to the uapi <linux/signal.h>."

Browse Source 
* commit '99a38fcf33d220524e41979a3f9d842399fd638d':
  Prepare to switch to the uapi <linux/signal.h>.
This commit is contained in:
Elliott Hughes 2013-11-07 12:45:33 -08:00 committed by Android Git Automerger
commit b92de38170
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libc/bionic/pthread_exit.cpp
View File

@ -28,6 +28,7 @@
#include <pthread.h> #include <pthread.h>
#include <signal.h>
#include <stdlib.h> #include <stdlib.h>
#include <sys/mman.h> #include <sys/mman.h>

10
libc/include/signal.h
View File

@ -39,18 +39,16 @@
/* For 64-bit, the kernel's struct sigaction doesn't match the POSIX one, /* For 64-bit, the kernel's struct sigaction doesn't match the POSIX one,
* so we need to expose our own and translate behind the scenes. */ * so we need to expose our own and translate behind the scenes. */
# define sigaction __kernel_sigaction # define sigaction __kernel_sigaction
# include <asm/signal.h> # include <linux/signal.h>
# undef sigaction # undef sigaction
#else #else
/* For 32-bit, we're stuck with the definitions we already shipped, /* For 32-bit, we're stuck with the definitions we already shipped,
* even though they contain a sigset_t that's too small. */ * even though they contain a sigset_t that's too small. */
# include <asm/signal.h> # define __ARCH_SI_UID_T __kernel_uid32_t /* TODO: remove this when we switch to uapi. */
# include <linux/signal.h>
# undef __ARCH_SI_UID_T
#endif #endif
#define __ARCH_SI_UID_T __kernel_uid32_t
#include <asm/siginfo.h>
#undef __ARCH_SI_UID_T
__BEGIN_DECLS __BEGIN_DECLS
typedef int sig_atomic_t; typedef int sig_atomic_t;

7
libc/include/time.h
View File

@ -32,11 +32,6 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#include <sys/time.h> #include <sys/time.h>
/* For struct sigevent. */
#define __ARCH_SI_UID_T __kernel_uid32_t
#include <asm/siginfo.h>
#undef __ARCH_SI_UID_T
__BEGIN_DECLS __BEGIN_DECLS
#define CLOCKS_PER_SEC 1000000 #define CLOCKS_PER_SEC 1000000
@ -45,6 +40,8 @@ extern char* tzname[];
extern int daylight; extern int daylight;
extern long int timezone; extern long int timezone;
struct sigevent;
struct tm { struct tm {
int tm_sec; int tm_sec;
int tm_min; int tm_min;