File mono-141562-winternl.patch of Package mingw32-mono

Overview Repositories Revisions Requests Users Attributes Meta

File mono-141562-winternl.patch of Package mingw32-mono (Revision eb5ed00766e1dea03f8176476efa6b88)

Currently displaying revision eb5ed00766e1dea03f8176476efa6b88 , Show latest

From ccd96232d983dd0d7624e7b22a2bcce7f0fb92e0 Mon Sep 17 00:00:00 2001
From: Hib Eris <hib@hiberis.nl>
Date: Sat, 3 Oct 2009 10:39:39 +0200
Subject: [PATCH] 2009-10-3 Hib Eris <hib@hiberis.nl>

*configure.in: Check for winternl.h.
*mono/io-layer/io-layer.h: move winternal and ddk includes to process.c
*mono/metadata/process.c: add winternal and ddk includes here, always use winternl.h when available.
---
 configure.in             |    5 +++++
 mono/io-layer/io-layer.h |   11 -----------
 mono/metadata/process.c  |   11 +++++++++++
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/configure.in b/configure.in
index 52a0974..419ef86 100644
--- a/configure.in
+++ b/configure.in
@@ -1595,6 +1595,11 @@ if test x$platform_win32 = xno; then
 	dnl * on xp+
 	AC_DEFINE(HAVE_GETPROCESSID, 1, [Define if GetProcessId is available])
 else
+	dnl *********************************
+	dnl *** Checks for Windows compilation ***
+	dnl *********************************
+	AC_CHECK_HEADERS(winternl.h)
+
 	jdk_headers_found=no
 	AC_CHECK_LIB(ws2_32, main, LIBS="$LIBS -lws2_32", AC_ERROR(bad mingw install?))
 	AC_CHECK_LIB(psapi, main, LIBS="$LIBS -lpsapi", AC_ERROR(bad mingw install?))
diff --git a/mono/io-layer/io-layer.h b/mono/io-layer/io-layer.h
index 4776f8d..0676226 100644
--- a/mono/io-layer/io-layer.h
+++ b/mono/io-layer/io-layer.h
@@ -31,17 +31,6 @@
 #if (_WIN32_WINNT < 0x0502)
 #undef GetProcessId
 #endif
-#ifndef HAVE_GETPROCESSID
-#ifdef _MSC_VER
-#include <winternl.h>
-#ifndef NT_SUCCESS
-#define NT_SUCCESS(status) ((NTSTATUS) (status) >= 0)
-#endif /* !NT_SUCCESS */
-#else /* !_MSC_VER */
-#include <ddk/ntddk.h>
-#include <ddk/ntapi.h>
-#endif /* _MSC_VER */
-#endif /* !HAVE_GETPROCESSID */
 #else	/* EVERYONE ELSE */
 #include "mono/io-layer/wapi.h"
 #include "mono/io-layer/uglify.h"
diff --git a/mono/metadata/process.c b/mono/metadata/process.c
index ab6ed49..744a31a 100644
--- a/mono/metadata/process.c
+++ b/mono/metadata/process.c
@@ -23,6 +23,17 @@
 #include <mono/utils/strenc.h>
 #include <mono/utils/mono-proclib.h>
 #include <mono/io-layer/io-layer.h>
+#ifndef HAVE_GETPROCESSID
+#if defined(_MSC_VER) || defined(HAVE_WINTERNL_H)
+#include <winternl.h>
+#ifndef NT_SUCCESS
+#define NT_SUCCESS(status) ((NTSTATUS) (status) >= 0)
+#endif /* !NT_SUCCESS */
+#else /* ! (defined(_MSC_VER) || defined(HAVE_WINTERNL_H)) */
+#include <ddk/ntddk.h>
+#include <ddk/ntapi.h>
+#endif /* (defined(_MSC_VER) || defined(HAVE_WINTERNL_H)) */
+#endif /* !HAVE_GETPROCESSID */
 /* FIXME: fix this code to not depend so much on the inetrnals */
 #include <mono/metadata/class-internals.h>
 
-- 
1.6.0.4

Places

File mono-141562-winternl.patch of Package mingw32-mono (Revision eb5ed00766e1dea03f8176476efa6b88)

Places