* Merge in cygwin-64bit-branch.

2013-04-23 09:44:36 +00:00
parent 1875ee55d3
commit 61522196c7
253 changed files with 10632 additions and 5055 deletions
--- a/winsup/cygwin/advapi32.cc
+++ b/winsup/cygwin/advapi32.cc
@@ -43,7 +43,7 @@ DuplicateTokenEx (HANDLE tok, DWORD access, LPSECURITY_ATTRIBUTES sec_attr,
  OBJECT_ATTRIBUTES attr =
    { sizeof attr, NULL, NULL,
      (sec_attr && sec_attr->bInheritHandle) ? OBJ_INHERIT : 0U,
-      (sec_attr ? sec_attr->lpSecurityDescriptor : NULL), &sqos };
+      sec_attr ? sec_attr->lpSecurityDescriptor : NULL, &sqos };
  NTSTATUS status = NtDuplicateToken (tok, access, &attr, FALSE, type, new_tok);
  DEFAULT_NTSTATUS_TO_BOOL_RETURN
 }