diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-10-30 01:14:23 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-10-30 01:14:23 +0000 |
| commit | 6e46869a9c0c9f5e31378247e5835cd0b3301c96 (patch) | |
| tree | dad4ede474ab46f074fd8381965d160f6a2ac92c /libc/sysdeps/linux/common | |
| parent | ca798b3b1e0937336dc382b6f3fe7453a219fd2f (diff) | |
| download | uClibc-alpine-6e46869a9c0c9f5e31378247e5835cd0b3301c96.tar.bz2 uClibc-alpine-6e46869a9c0c9f5e31378247e5835cd0b3301c96.tar.xz | |
Merge from trunk.
Diffstat (limited to 'libc/sysdeps/linux/common')
| -rw-r--r-- | libc/sysdeps/linux/common/getdents.c | 2 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/getdents64.c | 2 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/mmap64.c | 2 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/ssp.c | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/libc/sysdeps/linux/common/getdents.c b/libc/sysdeps/linux/common/getdents.c index ab6a276bb..416ced4ea 100644 --- a/libc/sysdeps/linux/common/getdents.c +++ b/libc/sysdeps/linux/common/getdents.c @@ -26,7 +26,7 @@ #include <unistd.h> #include <sys/param.h> #include <sys/types.h> -#include <sysdep.h> +#include "sysdep.h" #include <sys/syscall.h> diff --git a/libc/sysdeps/linux/common/getdents64.c b/libc/sysdeps/linux/common/getdents64.c index a37f5e514..1b4b0c368 100644 --- a/libc/sysdeps/linux/common/getdents64.c +++ b/libc/sysdeps/linux/common/getdents64.c @@ -25,7 +25,7 @@ #include <stdint.h> #include <string.h> #include <unistd.h> -#include <sysdep.h> +#include "sysdep.h" #include <sys/param.h> #include <sys/types.h> #include <sys/syscall.h> diff --git a/libc/sysdeps/linux/common/mmap64.c b/libc/sysdeps/linux/common/mmap64.c index eaf914432..969e1e227 100644 --- a/libc/sysdeps/linux/common/mmap64.c +++ b/libc/sysdeps/linux/common/mmap64.c @@ -22,7 +22,7 @@ #include <features.h> #include <errno.h> #include <unistd.h> -#include <sysdep.h> +#include "sysdep.h" #include <sys/mman.h> diff --git a/libc/sysdeps/linux/common/ssp.c b/libc/sysdeps/linux/common/ssp.c index 7791a0104..2f3a28ba4 100644 --- a/libc/sysdeps/linux/common/ssp.c +++ b/libc/sysdeps/linux/common/ssp.c @@ -87,6 +87,7 @@ void __attribute__ ((noreturn)) __stack_chk_fail(void) terminate(); } +#if 0 void __attribute__ ((noreturn)) __chk_fail(void) { extern char *__progname; @@ -101,3 +102,4 @@ void __attribute__ ((noreturn)) __chk_fail(void) while(1) terminate(); } +#endif |