In r260015, I renamed several identifiers to avoid -Wsystem-header
warnings.  In r261283, I imported libc++ 3.4 release, but this contained
one identifier that had not been renamed yet, leading to a compilation
error when using -std=c++1y.  Fix the compilation error by correctly
renaming the identifier.

Reported by:	rcarter@pinyon.org
PR:		base/192139
MFC after:	3 days


git-svn-id: svn+ssh://svn.freebsd.org/base/head@270416 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Fix arm build breakage when building stable/10 on
head/.

MFC after:	3 days
Sponsored by:	The FreeBSD Foundation


git-svn-id: svn+ssh://svn.freebsd.org/base/head@270417 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f