drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* include/ntdef.h: Protect definition of OBJECT_ATTRIBUTES against 

previous definition in include/ntsecapi.h.
        * include/ntsecapi.h: Vice versa.
This commit is contained in:
Corinna Vinschen 2001-05-17 15:16:37 +00:00
parent 4293884185
commit a69eb9099b
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/w32api/ChangeLog
View File

@ -1,3 +1,9 @@
Wed May 17 17:12:00 2001 Corinna Vinschen <corinna@vinschen.de>
* include/ntdef.h: Protect definition of OBJECT_ATTRIBUTES against
previous definition in include/ntsecapi.h.
* include/ntsecapi.h: Vice versa.
Wed May 16 17:59:00 2001 Corinna Vinschen <corinna@vinschen.de>
* include/winnt.h: Add defines for group attributes.

2
winsup/w32api/include/ntdef.h
View File

@ -38,6 +38,7 @@ typedef enum _SECTION_INHERIT {
ViewShare = 1,
ViewUnmap = 2
} SECTION_INHERIT;
#if !defined(_NTSECAPI_H)
typedef struct _OBJECT_ATTRIBUTES {
ULONG Length;
HANDLE RootDirectory;
@ -46,4 +47,5 @@ typedef struct _OBJECT_ATTRIBUTES {
PVOID SecurityDescriptor;
PVOID SecurityQualityOfService;
} OBJECT_ATTRIBUTES, *POBJECT_ATTRIBUTES;
#endif
#endif /* _NTDEF_H */

2
winsup/w32api/include/ntsecapi.h
View File

@ -251,6 +251,7 @@ typedef struct _LSA_ENUMERATION_INFORMATION {
PSID Sid;
} LSA_ENUMERATION_INFORMATION, *PLSA_ENUMERATION_INFORMATION;
typedef ULONG LSA_OPERATIONAL_MODE, *PLSA_OPERATIONAL_MODE;
#if !defined(_NTDEF_H)
typedef struct _LSA_OBJECT_ATTRIBUTES {
ULONG Length;
HANDLE RootDirectory;
@ -259,6 +260,7 @@ typedef struct _LSA_OBJECT_ATTRIBUTES {
PVOID SecurityDescriptor;
PVOID SecurityQualityOfService;
} OBJECT_ATTRIBUTES, *POBJECT_ATTRIBUTES;
#endif
typedef OBJECT_ATTRIBUTES LSA_OBJECT_ATTRIBUTES, *PLSA_OBJECT_ATTRIBUTES;
typedef struct _LSA_TRUST_INFORMATION {
LSA_UNICODE_STRING Name;