From owner-svn-src-projects@freebsd.org  Wed Sep  7 20:41:09 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B50EBBD0B68
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Wed,  7 Sep 2016 20:41:09 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 83310B79;
 Wed,  7 Sep 2016 20:41:09 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u87Kf8US066566;
 Wed, 7 Sep 2016 20:41:08 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u87Kf8pI066565;
 Wed, 7 Sep 2016 20:41:08 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201609072041.u87Kf8pI066565@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Wed, 7 Sep 2016 20:41:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r305565 - projects/clang390-import/contrib/libc++/include
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Sep 2016 20:41:09 -0000

Author: dim
Date: Wed Sep  7 20:41:08 2016
New Revision: 305565
URL: https://svnweb.freebsd.org/changeset/base/305565

Log:
  Revert r305496 for now, since jbeich@ found a good upstream fix for the
  Firefox port.

Modified:
  projects/clang390-import/contrib/libc++/include/exception

Modified: projects/clang390-import/contrib/libc++/include/exception
==============================================================================
--- projects/clang390-import/contrib/libc++/include/exception	Wed Sep  7 20:36:13 2016	(r305564)
+++ projects/clang390-import/contrib/libc++/include/exception	Wed Sep  7 20:41:08 2016	(r305565)
@@ -80,6 +80,10 @@ template <class E> void rethrow_if_neste
 #include <__config>
 #include <cstddef>
 #include <type_traits>
+#if defined(_LIBCPP_NO_EXCEPTIONS)
+#include <cstdio>
+#include <cstdlib>
+#endif
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
@@ -251,11 +255,6 @@ rethrow_if_nested(const _Ep&, typename e
 
 }  // std
 
-#if defined(_LIBCPP_NO_EXCEPTIONS)
-#include <cstdio>
-#include <cstdlib>
-#endif
-
 _LIBCPP_BEGIN_NAMESPACE_STD
 
 template <class _Exception>