diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2001-05-17 15:16:37 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2001-05-17 15:16:37 +0000 |
| commit | a69eb9099b22e00e732027af62c701165e209648 (patch) | |
| tree | 969442f032093c2b095a3ca470a52f17dbed1e78 | |
| parent | 4293884185ef22d39b53c1e550c980df8921f6a5 (diff) | |
| download | cygnal-a69eb9099b22e00e732027af62c701165e209648.tar.gz cygnal-a69eb9099b22e00e732027af62c701165e209648.tar.bz2 cygnal-a69eb9099b22e00e732027af62c701165e209648.zip | |
* include/ntdef.h: Protect definition of OBJECT_ATTRIBUTES against
previous definition in include/ntsecapi.h.
* include/ntsecapi.h: Vice versa.
| -rw-r--r-- | winsup/w32api/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/w32api/include/ntdef.h | 2 | ||||
| -rw-r--r-- | winsup/w32api/include/ntsecapi.h | 2 |
3 files changed, 10 insertions, 0 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 50d5eb7d1..817982705 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -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. diff --git a/winsup/w32api/include/ntdef.h b/winsup/w32api/include/ntdef.h index f4f990747..623a71492 100644 --- a/winsup/w32api/include/ntdef.h +++ b/winsup/w32api/include/ntdef.h @@ -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 */ diff --git a/winsup/w32api/include/ntsecapi.h b/winsup/w32api/include/ntsecapi.h index 0531f47c8..eaf5ba4a1 100644 --- a/winsup/w32api/include/ntsecapi.h +++ b/winsup/w32api/include/ntsecapi.h @@ -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; |