diff options
| author | Elliott Hughes <enh@google.com> | 2018-07-24 12:45:06 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-07-24 12:45:06 -0700 |
| commit | f34903ed6f836dc496b819ca5e246ed8ac10138c (patch) | |
| tree | 068475a0a85f6ed4919d4443fb39e7027e8485ed /libc/include/string.h | |
| parent | 07a2606db934d1ecf6debe2332f713bb1feab615 (diff) | |
| parent | 9e02e20878aaae4ea639246213af61378ccc728c (diff) | |
Merge "Revert "Retire GCC FORTIFY."" am: 758051f058
am: 9e02e20878
Change-Id: I79064de26a6642b2ff5a788c8ccb50bf91c35ab7
Diffstat (limited to 'libc/include/string.h')
| -rw-r--r-- | libc/include/string.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libc/include/string.h b/libc/include/string.h index 25f6673a9..54d5e1c80 100644 --- a/libc/include/string.h +++ b/libc/include/string.h @@ -144,7 +144,7 @@ char* basename(const char* __path) __RENAME(__gnu_basename) __INTRODUCED_IN(23); #endif /* Const-correct overloads. Placed after FORTIFY so we call those functions, if possible. */ -#if defined(__cplusplus) +#if defined(__cplusplus) && defined(__clang__) /* * Use two enable_ifs so these overloads don't conflict with + are preferred over libcxx's. This can * be reduced to 1 after libcxx recognizes that we have const-correct overloads. |