Author: akhaldi
Date: Sat Jul 24 09:59:34 2010
New Revision: 48226
URL:
http://svn.reactos.org/svn/reactos?rev=48226&view=rev
Log:
[MINGW-W64]
- Sync gs_support.c now that our patches are committed upstream.
Modified:
trunk/reactos/lib/3rdparty/mingw/gs_support.c
Modified: trunk/reactos/lib/3rdparty/mingw/gs_support.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/gs_supp…
==============================================================================
--- trunk/reactos/lib/3rdparty/mingw/gs_support.c [iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/mingw/gs_support.c [iso-8859-1] Sat Jul 24 09:59:34 2010
@@ -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 @@
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 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;