File 0001-2010-06-13-Hib-Eris-hib-hiberis.nl.patch of Package mingw32-mono

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-2010-06-13-Hib-Eris-hib-hiberis.nl.patch of Package mingw32-mono (Revision 83a8c7997eb6efb2c20149edd6c08908)

Currently displaying revision 83a8c7997eb6efb2c20149edd6c08908 , Show latest

From 8f535d34c6dd3107871a56bcd9c4d3ea65dd4a89 Mon Sep 17 00:00:00 2001
From: Hib Eris <hib@hiberis.nl>
Date: Sat, 3 Oct 2009 10:39:39 +0200
Subject: [PATCH 01/10] 2010-06-13 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.

These changes are nescessary for compiling with a mingw compiler that
    uses the mingw64 headers.
---
 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 4b6567d..d2885d2 100644
--- a/configure.in
+++ b/configure.in
@@ -1775,6 +1775,11 @@ if test x$target_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 e6af1c6..57ef8db 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 48f9db9..f3521e8 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.4.2

Places

File 0001-2010-06-13-Hib-Eris-hib-hiberis.nl.patch of Package mingw32-mono (Revision 83a8c7997eb6efb2c20149edd6c08908)

Places