From 0e192aab8145d7201e6efa9f50abb4d7a0d66ac2 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sat, 24 Jul 2010 09:59:34 +0000
Subject: [PATCH] [MINGW-W64] - Sync gs_support.c now that our patches are
 committed upstream.

svn path=/trunk/; revision=48226
---
 reactos/lib/3rdparty/mingw/gs_support.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/reactos/lib/3rdparty/mingw/gs_support.c b/reactos/lib/3rdparty/mingw/gs_support.c
index 4be8fe45736..dd072382339 100644
--- a/reactos/lib/3rdparty/mingw/gs_support.c
+++ b/reactos/lib/3rdparty/mingw/gs_support.c
@@ -4,7 +4,14 @@
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#define WIN32_NO_STATUS
+#include <stdlib.h>	/* abort () */
 #include <windows.h>
+#undef  WIN32_NO_STATUS
+#include <ntstatus.h>	/* STATUS macros */
 #ifdef _WIN64
 #include <intrin.h>
 #endif
@@ -22,10 +29,9 @@ PVOID RtlVirtualUnwind (ULONG HandlerType, ULONG64, ULONG64, PRUNTIME_FUNCTION,
 			PCONTEXT, PVOID *, PULONG64, PVOID);
 #endif
 
-typedef LONG NTSTATUS;
+typedef LONG NTSTATUS;	/* same as in ntdef.h / winternl.h */
 
 #define UNW_FLAG_NHANDLER 0x00
-#define STATUS_STACK_BUFFER_OVERRUN ((NTSTATUS)0xC0000409L)
 
 typedef union
 {
@@ -101,7 +107,7 @@ __declspec(noreturn) void __cdecl __report_gsfailure (ULONGLONG);
 __declspec(noreturn) void __cdecl
 __report_gsfailure (ULONGLONG StackCookie)
 {
-  volatile UINT_PTR __UNUSED_PARAM(cookie[2]);
+  volatile UINT_PTR cookie[2] __MINGW_ATTRIB_UNUSED;
 #ifdef _WIN64
   ULONG64 controlPC, imgBase, establisherFrame;
   PRUNTIME_FUNCTION fctEntry;