From f4e682c8f54a70cacbc412c1bd24cf619e1023e7 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Sun, 28 Jun 2009 21:11:47 +0000 Subject: [PATCH] remove old incarnation of .NET support --- includes/DNInvoke.h | 55 ------------------------------------------- includes/Dotnet.h | 64 --------------------------------------------------- includes/Rts.h | 4 ---- rts/package.conf.in | 3 --- 4 files changed, 126 deletions(-) delete mode 100644 includes/DNInvoke.h delete mode 100644 includes/Dotnet.h diff --git a/includes/DNInvoke.h b/includes/DNInvoke.h deleted file mode 100644 index 410bd64..0000000 --- a/includes/DNInvoke.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * C callable bridge to the .NET object model - * - * (c) 2003, sof. - * - */ -#ifndef __DNINVOKE_H__ -#define __DNINVOKE_H__ -#include "Dotnet.h" - -extern char* DN_invokeStatic ( char *assemName, - char *methName, - DotnetArg *args, - int n_args, - DotnetType resultTy, - void *res); -extern char* DN_getStatic ( char *assemName, - char *fieldClsName, - DotnetArg *args, - int n_args, - DotnetType resultTy, - void *res); -extern char* DN_setStatic ( char *assemName, - char *fieldClsName, - DotnetArg *args, - int n_args, - DotnetType resultTy, - void *res); -extern char* DN_createObject ( char *assemName, - char *methName, - DotnetArg *args, - int n_args, - DotnetType resultTy, - void *res); - -extern char* DN_invokeMethod ( char *methName, - DotnetArg *args, - int n_args, - DotnetType resultTy, - void *res); - -extern char* DN_getField ( char *methName, - DotnetArg *args, - int n_args, - DotnetType resultTy, - void *res); -extern char* DN_setField ( char *clsAndMethName, - DotnetArg *args, - int n_args, - DotnetType resultTy, - void *res); - -extern void stopDotnetBridge(void); - -#endif /* __DNINVOKE_H__ */ diff --git a/includes/Dotnet.h b/includes/Dotnet.h deleted file mode 100644 index 89dace2..0000000 --- a/includes/Dotnet.h +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Types and definitions to support GHC .NET interop. - * - * (c) 2003, sof. - * - */ -#ifndef __DOTNET_H__ -#define __DOTNET_H__ - -typedef enum { - Dotnet_Byte = 0, - Dotnet_Boolean, - Dotnet_Char, - Dotnet_Double, - Dotnet_Float, - Dotnet_Int, - Dotnet_Int8, - Dotnet_Int16, - Dotnet_Int32, - Dotnet_Int64, - Dotnet_Word8, - Dotnet_Word16, - Dotnet_Word32, - Dotnet_Word64, - Dotnet_Ptr, - Dotnet_Unit, - Dotnet_Object, - Dotnet_String -} DotnetType; - -typedef union { - unsigned char arg_byte; - unsigned int arg_bool; - unsigned char arg_char; - int arg_int; - signed char arg_int8; - signed short arg_int16; - signed int arg_int32; -#if defined(_MSC_VER) - signed __int64 arg_int64; -#else - signed long long arg_int64; -#endif - float arg_float; - double arg_double; - unsigned char arg_word8; - unsigned short arg_word16; - unsigned int arg_word32; -#if defined(_MSC_VER) - unsigned __int64 arg_word64; -#else - unsigned long long arg_word64; -#endif - void* arg_ptr; - void* arg_obj; - void* arg_str; -} DotnetArgVal; - -typedef struct { - DotnetArgVal arg; - DotnetType arg_type; -} DotnetArg; - -#endif /* __DOTNET_H__ */ diff --git a/includes/Rts.h b/includes/Rts.h index 690c170..a32bf34 100644 --- a/includes/Rts.h +++ b/includes/Rts.h @@ -207,10 +207,6 @@ extern void stackOverflow(void); extern void __decodeDouble_2Int (I_ *man_sign, W_ *man_high, W_ *man_low, I_ *exp, StgDouble dbl); extern void __decodeFloat_Int (I_ *man, I_ *exp, StgFloat flt); -#if defined(WANT_DOTNET_SUPPORT) -#include "DNInvoke.h" -#endif - /* Initialising the whole adjustor thunk machinery. */ extern void initAdjustor(void); diff --git a/rts/package.conf.in b/rts/package.conf.in index a49cee6..3b890d7 100644 --- a/rts/package.conf.in +++ b/rts/package.conf.in @@ -33,9 +33,6 @@ extra-libraries: "m" /* for ldexp() */ #ifdef mingw32_HOST_OS ,"wsock32" /* for the linker */ #endif -#ifdef WANT_DOTNET_SUPPORT - , "oleaut32", "ole32", "uuid" -#endif #if defined(DEBUG) && defined(HAVE_LIBBFD) ,"bfd", "iberty" /* for debugging */ #endif -- 1.7.10.4