diff options
| author | George Burgess IV <gbiv@google.com> | 2017-07-20 15:13:09 -0700 |
|---|---|---|
| committer | George Burgess IV <gbiv@google.com> | 2017-07-21 11:25:52 -0700 |
| commit | 53c4c8abb009e3381bd8f5d223045eb6985c4f3d (patch) | |
| tree | 32750eda49300dfda3c3815e6496429a6b6975e0 | |
| parent | dcdd0e37603215320d4fd175792aeef279a80606 (diff) | |
| download | android_bionic-53c4c8abb009e3381bd8f5d223045eb6985c4f3d.tar.gz android_bionic-53c4c8abb009e3381bd8f5d223045eb6985c4f3d.tar.bz2 android_bionic-53c4c8abb009e3381bd8f5d223045eb6985c4f3d.zip | |
Remove outdated _FORTIFY_SOURCE #undefs
AFAICT, all of these were added prior to the new-style FORTIFY going
in. Because clang saw two definitions of the "same" function, it got
upset. (e.g. 35d937e4eb7b8e0a4e9a113d2f7434d55c0bc056)
Now that our FORTIFY functions are overloads of their library functions,
these undefs can be removed.
(This is a step toward making FORTIFY a library with -U_FORTIFY_SOURCE
on it, as requested in the bug.)
Bug: 12231437
Test: CtsBionicUnitTests. No new failures.
Change-Id: I844ff77106ee2bea72ae1cd0bb85d146939ecd05
| -rw-r--r-- | libc/bionic/getcwd.cpp | 1 | ||||
| -rw-r--r-- | libc/bionic/poll.cpp | 1 | ||||
| -rw-r--r-- | libc/bionic/readlink.cpp | 2 | ||||
| -rw-r--r-- | libc/bionic/recv.cpp | 1 | ||||
| -rw-r--r-- | libc/bionic/strchr.cpp | 1 | ||||
| -rw-r--r-- | libc/bionic/strrchr.cpp | 1 |
6 files changed, 0 insertions, 7 deletions
diff --git a/libc/bionic/getcwd.cpp b/libc/bionic/getcwd.cpp index c2a7e2349..50487ec0c 100644 --- a/libc/bionic/getcwd.cpp +++ b/libc/bionic/getcwd.cpp @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#undef _FORTIFY_SOURCE #include <errno.h> #include <malloc.h> #include <string.h> diff --git a/libc/bionic/poll.cpp b/libc/bionic/poll.cpp index eded56a85..dbc9584e9 100644 --- a/libc/bionic/poll.cpp +++ b/libc/bionic/poll.cpp @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#undef _FORTIFY_SOURCE #include <errno.h> #include <sys/poll.h> #include <sys/select.h> diff --git a/libc/bionic/readlink.cpp b/libc/bionic/readlink.cpp index a53f933c8..3bb7bc18a 100644 --- a/libc/bionic/readlink.cpp +++ b/libc/bionic/readlink.cpp @@ -26,8 +26,6 @@ * SUCH DAMAGE. */ -#undef _FORTIFY_SOURCE - #include <fcntl.h> #include <sys/stat.h> #include <sys/types.h> diff --git a/libc/bionic/recv.cpp b/libc/bionic/recv.cpp index 061cd466f..60f264d3d 100644 --- a/libc/bionic/recv.cpp +++ b/libc/bionic/recv.cpp @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#undef _FORTIFY_SOURCE #include <sys/socket.h> ssize_t recv(int socket, void *buf, size_t len, int flags) { diff --git a/libc/bionic/strchr.cpp b/libc/bionic/strchr.cpp index 5bd3f19f8..fd8a924a9 100644 --- a/libc/bionic/strchr.cpp +++ b/libc/bionic/strchr.cpp @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#undef _FORTIFY_SOURCE #include <string.h> char* strchr(const char* p, int ch) { diff --git a/libc/bionic/strrchr.cpp b/libc/bionic/strrchr.cpp index 3fdb47cae..b6c40f442 100644 --- a/libc/bionic/strrchr.cpp +++ b/libc/bionic/strrchr.cpp @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#undef _FORTIFY_SOURCE #include <string.h> char* strrchr(const char* p, int ch) { |