diff options
| author | Jeff Johnston <jjohnstn@redhat.com> | 2004-12-02 19:30:56 +0000 |
|---|---|---|
| committer | Jeff Johnston <jjohnstn@redhat.com> | 2004-12-02 19:30:56 +0000 |
| commit | 70e9da424917db73a5fa6c9db39904115eba4555 (patch) | |
| tree | 5bd048f7c65d7b4938b52b6d09ff64ddeba029a4 /newlib | |
| parent | f9095d09fe2f2194d30d34c86d2410e7712f6b7e (diff) | |
| download | newlib-70e9da424917db73a5fa6c9db39904115eba4555.zip newlib-70e9da424917db73a5fa6c9db39904115eba4555.tar.gz newlib-70e9da424917db73a5fa6c9db39904115eba4555.tar.bz2 | |
2004-12-02 Shaun Jackman <sjackman@gmail.com>
* libc/sys/linux/stdlib/glob.c: Include <sys/types.h> which defines
time_t before including sys/stat.h, which uses it.
* libc/sys/linux/sys/stat.h: Include <sys/types.h> and
<linux/time.h> just prior to definition of __KERNEL__ so as to
allow building on Debian Linux where otherwise, mktime would
be redefined.
Diffstat (limited to 'newlib')
| -rw-r--r-- | newlib/ChangeLog | 9 | ||||
| -rw-r--r-- | newlib/libc/sys/linux/stdlib/glob.c | 1 | ||||
| -rw-r--r-- | newlib/libc/sys/linux/sys/stat.h | 5 |
3 files changed, 13 insertions, 2 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 77ee7ed..260488d 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,12 @@ +2004-12-02 Shaun Jackman <sjackman@gmail.com> + + * libc/sys/linux/stdlib/glob.c: Include <sys/types.h> which defines + time_t before including sys/stat.h, which uses it. + * libc/sys/linux/sys/stat.h: Include <sys/types.h> and + <linux/time.h> just prior to definition of __KERNEL__ so as to + allow building on Debian Linux where otherwise, mktime would + be redefined. + 2004-11-26 Paul Brook <paul@codesourcery.com> * libc/sys/arm/crt0.S (_start): Add .cantunwind annotation. diff --git a/newlib/libc/sys/linux/stdlib/glob.c b/newlib/libc/sys/linux/stdlib/glob.c index e40f12c..0e392b3 100644 --- a/newlib/libc/sys/linux/stdlib/glob.c +++ b/newlib/libc/sys/linux/stdlib/glob.c @@ -66,6 +66,7 @@ __FBSDID("$FreeBSD: src/lib/libc/gen/glob.c,v 1.19 2002/02/01 01:32:19 obrien Ex */ #include <sys/param.h> +#include <sys/types.h> #include <sys/stat.h> #include <ctype.h> diff --git a/newlib/libc/sys/linux/sys/stat.h b/newlib/libc/sys/linux/sys/stat.h index 7bc06f7..b7a7f53 100644 --- a/newlib/libc/sys/linux/sys/stat.h +++ b/newlib/libc/sys/linux/sys/stat.h @@ -7,14 +7,15 @@ #define _SYS_STAT_H #include <asm/stat.h> +#include <_ansi.h> +#include <sys/types.h> +#include <linux/time.h> #define __KERNEL__ #include <linux/stat.h> #undef __KERNEL__ /* --- redundant stuff below --- */ -#include <_ansi.h> -#include <sys/types.h> int _EXFUN(fstat,( int __fd, struct stat *__sbuf )); int _EXFUN(mkdir,( const char *_path, mode_t __mode )); |