From: sewardj Date: Fri, 12 May 2000 13:49:54 +0000 (+0000) Subject: [project @ 2000-05-12 13:49:54 by sewardj] X-Git-Tag: Approximately_9120_patches~4489 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=b36d01c87fa805dfcf0a9b8cfc3038418139aeed;p=ghc-hetmet.git [project @ 2000-05-12 13:49:54 by sewardj] 3rd time lucky with DIET_HEP and Cygwin. I hope. --- diff --git a/ghc/includes/DietHEP.h b/ghc/includes/DietHEP.h index 461164e..ca62de8 100644 --- a/ghc/includes/DietHEP.h +++ b/ghc/includes/DietHEP.h @@ -1,11 +1,11 @@ -typedef enum { dh_stdcall, dh_ccall } DHCALLCONV; -typedef int HMODULE; -typedef char* LPCSTR; - -extern HMODULE LoadLibrary ( LPCSTR modname ); -extern void* GetProcAddr ( DHCALLCONV cconv, - HMODULE hModule, - LPCSTR lpProcName ); +typedef enum { dh_stdcall, dh_ccall } DH_CALLCONV; +typedef int DH_MODULE; +typedef char* DH_LPCSTR; + +extern DH_MODULE DH_LoadLibrary ( DH_LPCSTR modname ); +extern void* DH_GetProcAddress ( DH_CALLCONV cconv, + DH_MODULE hModule, + DH_LPCSTR lpProcName ); diff --git a/ghc/interpreter/Makefile b/ghc/interpreter/Makefile index 0ef5ac5..9152365 100644 --- a/ghc/interpreter/Makefile +++ b/ghc/interpreter/Makefile @@ -1,6 +1,6 @@ # --------------------------------------------------------------------------- # -# $Id: Makefile,v 1.35 2000/05/12 13:41:59 sewardj Exp $ # +# $Id: Makefile,v 1.36 2000/05/12 13:49:54 sewardj Exp $ # # --------------------------------------------------------------------------- # TOP = .. @@ -38,7 +38,7 @@ C_SRCS = link.c type.c static.c storage.c derive.c input.c compiler.c subst.c \ translate.c codegen.c lift.c free.c stgSubst.c output.c \ hugs.c dynamic.c stg.c sainteger.c object.c interface.c -SRC_CC_OPTS = -I$(GHC_INTERPRETER_DIR) -I$(GHC_INCLUDE_DIR) -I$(GHC_RUNTIME_DIR) -D__HUGS__ -DCOMPILING_RTS -DNO_REGS -Wall -Wstrict-prototypes -Wno-unused -DDEBUG -Winline -g -O -DDIET_HEP +SRC_CC_OPTS = -I$(GHC_INTERPRETER_DIR) -I$(GHC_INCLUDE_DIR) -I$(GHC_RUNTIME_DIR) -D__HUGS__ -DCOMPILING_RTS -DNO_REGS -Wall -Wstrict-prototypes -Wno-unused -DDEBUG -Winline -g -O GHC_LIBS_NEEDED = $(GHC_RUNTIME_DIR)/libHSrts.a