diff options
author | Yabin Cui <yabinc@google.com> | 2014-12-09 20:15:48 -0800 |
---|---|---|
committer | Yabin Cui <yabinc@google.com> | 2014-12-10 06:36:11 +0000 |
commit | db4990373232182a897e10663344c429f5d1b2d5 (patch) | |
tree | 8d48e9207b23913728811131ce31beb70a78b011 | |
parent | 3f1c604c9df459f5baecfdc04cbe8ecda07b70eb (diff) | |
download | bionic-db4990373232182a897e10663344c429f5d1b2d5.tar.gz |
Use machine/timespec.h to separate timespec definition.
Bug: 18627763
Change-Id: Ib1c406320f0ecc3705d19183a48f986cdf57c279
-rw-r--r-- | libc/include/machine/timespec.h | 46 | ||||
-rw-r--r-- | libc/include/sched.h | 5 | ||||
-rw-r--r-- | libc/include/signal.h | 2 | ||||
-rw-r--r-- | libc/include/sys/select.h | 6 | ||||
-rw-r--r-- | libc/include/sys/stat.h | 7 |
5 files changed, 55 insertions, 11 deletions
diff --git a/libc/include/machine/timespec.h b/libc/include/machine/timespec.h new file mode 100644 index 000000000..11779ae43 --- /dev/null +++ b/libc/include/machine/timespec.h @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _MACHINE_TIMESPEC_H_ +#define _MACHINE_TIMESPEC_H_ + +#include <sys/types.h> + +/* + * This file is used to include timespec definition without introducing the whole + * <linux/time.h>, <sys/time.h> or <time.h>. + */ +#ifndef _STRUCT_TIMESPEC +#define _STRUCT_TIMESPEC +struct timespec { + time_t tv_sec; + long tv_nsec; +}; +#endif + +#endif /* _MACHINE_TIMESPEC_H_ */ diff --git a/libc/include/sched.h b/libc/include/sched.h index 4f9e2a6c2..930dd7c85 100644 --- a/libc/include/sched.h +++ b/libc/include/sched.h @@ -28,10 +28,9 @@ #ifndef _SCHED_H_ #define _SCHED_H_ -#include <sys/cdefs.h> -#include <sys/time.h> - #include <linux/sched.h> +#include <machine/timespec.h> +#include <sys/cdefs.h> __BEGIN_DECLS diff --git a/libc/include/signal.h b/libc/include/signal.h index 867f49748..9519f6d09 100644 --- a/libc/include/signal.h +++ b/libc/include/signal.h @@ -32,8 +32,8 @@ #include <asm/sigcontext.h> #include <errno.h> #include <limits.h> -#include <linux/time.h> #include <machine/pthread_types.h> +#include <machine/timespec.h> #include <string.h> #include <sys/cdefs.h> #include <sys/types.h> diff --git a/libc/include/sys/select.h b/libc/include/sys/select.h index 32c1206f1..553050bb6 100644 --- a/libc/include/sys/select.h +++ b/libc/include/sys/select.h @@ -29,11 +29,11 @@ #ifndef _SYS_SELECT_H_ #define _SYS_SELECT_H_ -#include <sys/cdefs.h> -#include <sys/time.h> -#include <sys/types.h> +#include <linux/time.h> #include <signal.h> #include <string.h> +#include <sys/cdefs.h> +#include <sys/types.h> __BEGIN_DECLS diff --git a/libc/include/sys/stat.h b/libc/include/sys/stat.h index 7d85dd1ef..e3f41a9d7 100644 --- a/libc/include/sys/stat.h +++ b/libc/include/sys/stat.h @@ -29,12 +29,11 @@ #ifndef _SYS_STAT_H_ #define _SYS_STAT_H_ +#include <endian.h> +#include <linux/stat.h> +#include <machine/timespec.h> #include <sys/cdefs.h> #include <sys/types.h> -#include <sys/time.h> -#include <linux/stat.h> - -#include <endian.h> __BEGIN_DECLS |