From 29c63d063fe3537b920d4f8bbb16a885ad414ed6 Mon Sep 17 00:00:00 2001 From: Robert Collins Date: Fri, 9 Nov 2001 08:31:37 +0000 Subject: [PATCH] 2001-11-09 Robert Collins * include/winnt.h: Backout last change. --- winsup/w32api/ChangeLog | 4 ++++ winsup/w32api/include/winnt.h | 15 +++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index e2cf375ad..6c2615e03 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,7 @@ +2001-11-09 Robert Collins + + * include/winnt.h: Backout last change. + 2001-11-08 Robert Collins * include/winnt.h: Define *_SID_AUTHORITY appropriately. (nested diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h index 70f15c33f..65f5d157d 100644 --- a/winsup/w32api/include/winnt.h +++ b/winsup/w32api/include/winnt.h @@ -267,12 +267,12 @@ typedef BYTE BOOLEAN,*PBOOLEAN; #define THREAD_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x3FF) #define EXCEPTION_NONCONTINUABLE 1 #define EXCEPTION_MAXIMUM_PARAMETERS 15 -#define SECURITY_NULL_SID_AUTHORITY {{0,0,0,0,0,0}} -#define SECURITY_WORLD_SID_AUTHORITY {{0,0,0,0,0,1}} -#define SECURITY_LOCAL_SID_AUTHORITY {{0,0,0,0,0,2}} -#define SECURITY_CREATOR_SID_AUTHORITY {{0,0,0,0,0,3}} -#define SECURITY_NON_UNIQUE_AUTHORITY {{0,0,0,0,0,4}} -#define SECURITY_NT_AUTHORITY {{0,0,0,0,0,5}} +#define SECURITY_NULL_SID_AUTHORITY {0,0,0,0,0,0} +#define SECURITY_WORLD_SID_AUTHORITY {0,0,0,0,0,1} +#define SECURITY_LOCAL_SID_AUTHORITY {0,0,0,0,0,2} +#define SECURITY_CREATOR_SID_AUTHORITY {0,0,0,0,0,3} +#define SECURITY_NON_UNIQUE_AUTHORITY {0,0,0,0,0,4} +#define SECURITY_NT_AUTHORITY {0,0,0,0,0,5} #define SECURITY_NULL_RID 0 #define SECURITY_WORLD_RID 0 #define SECURITY_LOCAL_RID 0 @@ -2524,7 +2524,6 @@ typedef struct _REPARSE_POINT_INFORMATION { WORD ReparseDataLength; WORD UnparsedNameLength; } REPARSE_POINT_INFORMATION, *PREPARSE_POINT_INFORMATION; -PVOID GetCurrentFiber(void); extern __inline__ PVOID GetCurrentFiber(void) { void* ret; @@ -2535,7 +2534,7 @@ extern __inline__ PVOID GetCurrentFiber(void) ); return ret; } -PVOID GetFiberData(void); + extern __inline__ PVOID GetFiberData(void) { void* ret;