From bea3ef947a51f735d0cebb3099a5a34f44c1dd30 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Fri, 5 Sep 2014 11:47:33 +0000 Subject: * exception.h (class exception): Remove unnecessary #ifdef. * uinfo.cc (client_request_pwdgrp::client_request_pwdgrp): Fix length counter to include trailing NUL. * sec_auth.cc (get_user_groups): Add experimental exception handler. (get_user_local_groups): Ditto. --- winsup/cygwin/exception.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'winsup/cygwin/exception.h') diff --git a/winsup/cygwin/exception.h b/winsup/cygwin/exception.h index 9e34799fe..3686bb0b2 100644 --- a/winsup/cygwin/exception.h +++ b/winsup/cygwin/exception.h @@ -126,17 +126,15 @@ public: ~exception () __attribute__ ((always_inline)) { _except_list = save; } }; -#else +#else /* __x86_64__ */ #define exception_list void typedef struct _DISPATCHER_CONTEXT *PDISPATCHER_CONTEXT; class exception { -#ifdef __x86_64__ static EXCEPTION_DISPOSITION myfault (EXCEPTION_RECORD *, exception_list *, CONTEXT *, PDISPATCHER_CONTEXT); -#endif static EXCEPTION_DISPOSITION handle (EXCEPTION_RECORD *, exception_list *, CONTEXT *, PDISPATCHER_CONTEXT); public: @@ -162,7 +160,7 @@ public: } }; -#endif /* !__x86_64 */ +#endif /* !__x86_64__ */ class cygwin_exception { -- cgit v1.2.3