...after 3b59dbbf "remove
HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE check and macro"

Change-Id: I0e9f3c15d48affe104dd6b5df9828ef5e62dfa88