From owner-svn-src-head@FreeBSD.ORG  Thu Sep 30 03:09:35 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E3AE2106566C;
	Thu, 30 Sep 2010 03:09:35 +0000 (UTC)
	(envelope-from davidxu@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D32038FC08;
	Thu, 30 Sep 2010 03:09:35 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o8U39Zma050857;
	Thu, 30 Sep 2010 03:09:35 GMT (envelope-from davidxu@svn.freebsd.org)
Received: (from davidxu@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8U39ZsW050855;
	Thu, 30 Sep 2010 03:09:35 GMT (envelope-from davidxu@svn.freebsd.org)
Message-Id: <201009300309.o8U39ZsW050855@svn.freebsd.org>
From: David Xu <davidxu@FreeBSD.org>
Date: Thu, 30 Sep 2010 03:09:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r213289 - head/include
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Sep 2010 03:09:36 -0000

Author: davidxu
Date: Thu Sep 30 03:09:35 2010
New Revision: 213289
URL: http://svn.freebsd.org/changeset/base/213289

Log:
  - Sizeof exception class type should always be 64-bit.
  - Make some functions be visible to BSD source code.

Modified:
  head/include/unwind.h

Modified: head/include/unwind.h
==============================================================================
--- head/include/unwind.h	Thu Sep 30 01:25:54 2010	(r213288)
+++ head/include/unwind.h	Thu Sep 30 03:09:35 2010	(r213289)
@@ -28,6 +28,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DE
 #ifndef _UNWIND_H
 #define _UNWIND_H
 
+#include <sys/_types.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -76,7 +78,7 @@ typedef _Unwind_Reason_Code (*_Unwind_St
    IA-64, while being more general.  */
 struct _Unwind_Exception
   {
-    unsigned long exception_class;
+    __int64_t exception_class;
     _Unwind_Exception_Cleanup_Fn exception_cleanup;
     unsigned long private_1;
     unsigned long private_2;
@@ -95,7 +97,7 @@ extern void _Unwind_SetIP (struct _Unwin
 extern unsigned long _Unwind_GetLanguageSpecificData (struct _Unwind_Context*);
 extern unsigned long _Unwind_GetRegionStart (struct _Unwind_Context *);
 
-#ifdef _GNU_SOURCE
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
 
 /* Callback for _Unwind_Backtrace().  The backtrace stops immediately
    if the callback returns any value other than _URC_NO_REASON. */
@@ -145,7 +147,7 @@ extern void *_Unwind_FindEnclosingFuncti
 /* See also Linux Standard Base Spec:
     http://www.linuxbase.org/spec/refspecs/LSB_1.3.0/gLSB/gLSB/libgcc-s.html */
 
-#endif /* _GNU_SOURCE */
+#endif /* _GNU_SOURCE || _BSD_SOURCE */
 
 #ifdef __cplusplus
 };