diff options
| author | Elliott Hughes <enh@google.com> | 2015-10-29 20:22:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-10-29 20:22:03 +0000 |
| commit | 927d599a4c5921f19e81607b1f851709018792cf (patch) | |
| tree | 698bdc5d82d1b011f34e014fd6672c63d3efaad1 | |
| parent | 9aa4decd99e7a29f946089ad00b9f7c83ec06db2 (diff) | |
| parent | 18c8204c1735fb192371407c0bfa60bbf711419e (diff) | |
| download | platform_external_elfutils-brillo-m7-release.tar.gz platform_external_elfutils-brillo-m7-release.tar.bz2 platform_external_elfutils-brillo-m7-release.zip | |
Merge "strdupa and strndupa are no longer used."brillo-m7-releasebrillo-m7-mr-devbrillo-m7-dev
| -rw-r--r-- | bionic-fixup/AndroidFixup.h | 4 | ||||
| -rw-r--r-- | bionic-fixup/argp.h | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/bionic-fixup/AndroidFixup.h b/bionic-fixup/AndroidFixup.h index 6e2f26f3..83d29527 100644 --- a/bionic-fixup/AndroidFixup.h +++ b/bionic-fixup/AndroidFixup.h @@ -17,10 +17,6 @@ #ifndef ANDROID_FIXUP_H #define ANDROID_FIXUP_H -/* These two don't seem like things we want in bionic, but elfutils uses every crazy thing. */ -#define strdupa(s) strcpy(alloca(strlen(s) + 1), s) -#define strndupa(s, n) strncpy(alloca(strnlen(s, n) + 1), s, n) - static inline void *rawmemchr(const void *s, int c) { const unsigned char *ptr = s; diff --git a/bionic-fixup/argp.h b/bionic-fixup/argp.h index 784a040b..fe53b6d5 100644 --- a/bionic-fixup/argp.h +++ b/bionic-fixup/argp.h @@ -20,10 +20,6 @@ // We don't have an implementation, but elfutils unconditionally includes this, // and relies on its transitive includes in places. -#include <ctype.h> #include <errno.h> -#include <getopt.h> -#include <limits.h> -#include <stdio.h> #endif /* ELFUTILS_ARGP_H */ |