Throughout, change __attribute__ ((regparm (N))) to just __regN. Throughout,
(mainly in fhandler*) start fixing gcc 4.7.2 mismatch between regparm definitions and declarations. * gendef: Define some functions to take @ declaration to accommodate _regN defines which use __stdcall. * gentls_offsets: Define __regN macros as empty. * autoload.cc (wsock_init): Remove unneeded regparm attribute. * winsup.h (__reg1): Define. (__reg2): Define. (__reg3): Define. * advapi32.cc (DuplicateTokenEx): Coerce some initializers to avoid warnings from gcc 4.7.2. * exceptions.cc (status_info): Declare struct to use NTSTATUS. (cygwin_exception::dump_exception): Coerce e->ExceptionCode to NTSTATUS. * fhandler_clipboard.cc (cygnativeformat): Redefine as UINT to avoid gcc 4.7.2 warnings. (fhandler_dev_clipboard::read): Ditto.
This commit is contained in:
@ -1,6 +1,6 @@
|
||||
/* advapi32.cc: Win32 replacement functions.
|
||||
|
||||
Copyright 2011, 2012 Red Hat, Inc.
|
||||
Copyright 2011, 2012, 2013 Red Hat, Inc.
|
||||
|
||||
This file is part of Cygwin.
|
||||
|
||||
@ -42,8 +42,8 @@ DuplicateTokenEx (HANDLE tok, DWORD access, LPSECURITY_ATTRIBUTES sec_attr,
|
||||
{ sizeof sqos, level, SECURITY_STATIC_TRACKING, FALSE };
|
||||
OBJECT_ATTRIBUTES attr =
|
||||
{ sizeof attr, NULL, NULL,
|
||||
sec_attr && sec_attr->bInheritHandle? OBJ_INHERIT : 0,
|
||||
sec_attr ? sec_attr->lpSecurityDescriptor : NULL, &sqos };
|
||||
(ULONG) ((sec_attr && sec_attr->bInheritHandle) ? OBJ_INHERIT : 0),
|
||||
(sec_attr ? sec_attr->lpSecurityDescriptor : NULL), &sqos };
|
||||
NTSTATUS status = NtDuplicateToken (tok, access, &attr, FALSE, type, new_tok);
|
||||
DEFAULT_NTSTATUS_TO_BOOL_RETURN
|
||||
}
|
||||
|
Reference in New Issue
Block a user