Index: stable/11/lib/atf/libatf-c/tests/Makefile
===================================================================
--- stable/11/lib/atf/libatf-c/tests/Makefile	(revision 349052)
+++ stable/11/lib/atf/libatf-c/tests/Makefile	(revision 349053)
@@ -1,36 +1,31 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 PACKAGE=	tests
 
 TESTS_SUBDIRS=	detail
 
 ATF=		${SRCTOP}/contrib/atf
 .PATH:		${ATF}/atf-c
 .PATH:		${ATF}/atf-c/detail
 
 CFLAGS+=	-DATF_INCLUDEDIR='"${INCLUDEDIR}"'
 CFLAGS+=	-I${ATF}
 
-# macros_test.c contains a double 'const const' which will be gone with
-# the import of atf-0.18.
-# TODO(jmmv): Remove this workaround once we do that update.
-CFLAGS.clang+=	-Wno-duplicate-decl-specifier
-
 ${PACKAGE}FILES+=	macros_h_test.c
 ${PACKAGE}FILES+=	unused_test.c
 
 .for _T in	atf_c_test \
 		build_test \
 		check_test \
 		error_test \
 		macros_test \
 		tc_test \
 		tp_test \
 		utils_test
 ATF_TESTS_C+=	${_T}
 SRCS.${_T}=	${_T}.c test_helpers.c
 .endfor
 
 .include <bsd.test.mk>
Index: stable/11
===================================================================
--- stable/11	(revision 349052)
+++ stable/11	(revision 349053)

Property changes on: stable/11
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r348498