Date: Sun, 11 Sep 2016 14:19:06 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r305693 - in stable: 10/contrib/gcclibs/libcpp 11/contrib/gcclibs/libcpp 9/contrib/gcclibs/libcpp Message-ID: <201609111419.u8BEJ62k013523@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Sun Sep 11 14:19:06 2016 New Revision: 305693 URL: https://svnweb.freebsd.org/changeset/base/305693 Log: MFC r305430: Define libcpp's HAVE_DESIGNATED_INITIALIZERS in a defined and portable way. Modified: stable/9/contrib/gcclibs/libcpp/system.h Directory Properties: stable/9/ (props changed) stable/9/contrib/ (props changed) stable/9/contrib/gcclibs/ (props changed) Changes in other areas also in this revision: Modified: stable/10/contrib/gcclibs/libcpp/system.h stable/11/contrib/gcclibs/libcpp/system.h Directory Properties: stable/10/ (props changed) stable/11/ (props changed) Modified: stable/9/contrib/gcclibs/libcpp/system.h ============================================================================== --- stable/9/contrib/gcclibs/libcpp/system.h Sun Sep 11 09:14:07 2016 (r305692) +++ stable/9/contrib/gcclibs/libcpp/system.h Sun Sep 11 14:19:06 2016 (r305693) @@ -347,9 +347,12 @@ extern void abort (void); ??? C99 designated initializers are not supported by most C++ compilers, including G++. -- gdr, 2005-05-18 */ #if !defined(HAVE_DESIGNATED_INITIALIZERS) -#define HAVE_DESIGNATED_INITIALIZERS \ - ((!defined(__cplusplus) && (GCC_VERSION >= 2007)) \ - || (__STDC_VERSION__ >= 199901L)) +# if (!defined(__cplusplus) && (GCC_VERSION >= 2007)) \ + ||(__STDC_VERSION__ >= 199901L) +# define HAVE_DESIGNATED_INITIALIZERS 1 +# else +# define HAVE_DESIGNATED_INITIALIZERS 0 +# endif #endif /* Be conservative and only use enum bitfields with GCC.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609111419.u8BEJ62k013523>