svn commit: r213289 - head/include

[David Xu]

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
 };