diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2013-10-26 13:37:34 +0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2013-10-26 13:37:34 +0400 |
| commit | 2e178c6909d93b1160fe12ee594d0038ef9af847 (patch) | |
| tree | b0e5256711ac1ff9cf5342cbb4fce1d538f60251 /winsup | |
| parent | 7a1dc2a940f927c76af423a97867ab12094487be (diff) | |
* 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.
Diffstat (limited to 'winsup')
| -rw-r--r-- | winsup/cygwin/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/cygwin/exception.h | 4 | ||||
| -rw-r--r-- | winsup/cygwin/include/exceptions.h | 6 |
3 files changed, 11 insertions, 5 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index a02489ddb..93003ff51 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,11 @@ 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 old-style console devices when called to perform BSD flock locking. Add a FIXME to comment and align description. diff --git a/winsup/cygwin/exception.h b/winsup/cygwin/exception.h index 5b11b0c00..8981c241b 100644 --- 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 498d584a9..82f064285 100644 --- 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 */ |