From 483170acc59d8bea9db05d2cae709be19e8d1bec Mon Sep 17 00:00:00 2001 From: vsc Date: Wed, 28 Aug 2002 14:02:35 +0000 Subject: [PATCH] allow compilation on WIN32 platforms. git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@577 b08c6af1-5177-4d33-ba66-4b1c6b8b522a --- C/iopreds.c | 2 +- C/scanner.c | 6 ++++++ H/Foreign.h | 5 ++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/C/iopreds.c b/C/iopreds.c index 6acbb6a76..0d7d1d89f 100644 --- a/C/iopreds.c +++ b/C/iopreds.c @@ -67,7 +67,7 @@ static char SccsId[] = "%W% %G%"; #if !HAVE_STRNCPY #define strncpy(X,Y,Z) strcpy(X,Y) #endif -#if _MSC_VER +#if _MSC_VER || defined(__MINGW32__) #include #endif #if _MSC_VER || defined(__MINGW32__) diff --git a/C/scanner.c b/C/scanner.c index f7da74f36..9157a7786 100644 --- a/C/scanner.c +++ b/C/scanner.c @@ -42,6 +42,12 @@ static char SccsId[] = "@(#)scanner.c 1.2"; #include "yapio.h" #include "alloc.h" #include "eval.h" +#if _MSC_VER || defined(__MINGW32__) +#if HAVE_FINITE==1 +#undef HAVE_FINITE +#endif +#include +#endif #include "iopreds.h" #if HAVE_STRING_H #include diff --git a/H/Foreign.h b/H/Foreign.h index d71d4961a..44373a2c0 100644 --- a/H/Foreign.h +++ b/H/Foreign.h @@ -51,11 +51,14 @@ #endif #endif -#ifdef _WIN32 +#if defined(_WIN32) || defined(__CYGWIN__) #ifdef NO_DYN #undef NO_DYN #define LOAD_DLL 1 #endif +#if LOAD_DL +#undef LOAD_DL +#endif #endif #ifdef __hpux