* exception.h (_exception_list): Drop redefinition for x86_64.

	* include/exceptions.h: Disable content for x86_64 since it's not
	using frame based exception handling anymore.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index a02489ddbb405193dd1b8694917d5c14e002cc37..93003ff51d1d75c355412a99d890a198f6e5ee72 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2013-10-25  Corinna Vinschen  <corinna@vinschen.de>
+
+       * exception.h (_exception_list): Drop redefinition for x86_64.
+       * include/exceptions.h: Disable content for x86_64 since it's not
+       using frame based exception handling anymore.
+
 2013-10-25  Corinna Vinschen  <corinna@vinschen.de>
 
        * flock.cc (fhandler_base::lock): Only refuse to lock nohandle and

diff --git a/winsup/cygwin/exception.h b/winsup/cygwin/exception.h
index 5b11b0c003b19f831580fbe5442becda0eedf782..8981c241bcc4421f7f41be7c2c7fc8811858bf2a 100644 (file)
--- a/winsup/cygwin/exception.h
+++ b/winsup/cygwin/exception.h
@@ -8,10 +8,6 @@ details. */
 
 #pragma once
 
-#ifdef __x86_64__
-#define _exception_list _EXCEPTION_REGISTRATION_RECORD
-#endif
-
 #include <exceptions.h>
 
 #ifndef __x86_64__

diff --git a/winsup/cygwin/include/exceptions.h b/winsup/cygwin/include/exceptions.h
index 498d584a9f69e357e9b5dbf903680bcc2a892871..82f0642856908e1b50b79f5ca8a8171f1d6578c8 100644 (file)
--- a/winsup/cygwin/include/exceptions.h
+++ b/winsup/cygwin/include/exceptions.h
@@ -1,6 +1,6 @@
 /* exceptions.h
 
-   Copyright 1996, 1997, 1998, 2000, 2001, 2005 Red Hat, Inc.
+   Copyright 1996, 1997, 1998, 2000, 2001, 2005, 2013 Red Hat, Inc.
 
 This file is part of Cygwin.
 
@@ -11,6 +11,8 @@ details. */
 #ifndef _EXCEPTIONS_H
 #define _EXCEPTIONS_H
 
+#ifndef __x86_64__
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
@@ -112,4 +114,6 @@ typedef struct _exception_list
 };
 #endif /* __cplusplus */
 
+#endif /* __x86_64__ */
+
 #endif /* _EXCEPTIONS_H */