diff --git a/ChangeLog b/ChangeLog index 8cc8190b1..ea260de83 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2007-12-14 Dietmar Warning + * configure.in, src/spicelib/devices/dev.c: allow mingw build w/o GUI + 2007-12-14 Holger Vogt * src/frontend/runcoms.c, runcoms2.c: fix the filetype problem if set in spinit diff --git a/configure.in b/configure.in index f5ca60957..f16328182 100644 --- a/configure.in +++ b/configure.in @@ -384,9 +384,11 @@ AC_CHECK_FUNCS(ftime) AC_CHECK_FUNCS(gettimeofday time) AC_CHECK_FUNCS(getrusage utimes) AC_CHECK_FUNCS(getrlimit ulimit , break) -if test "$with_windows" = "yes"; then - AC_DEFINE(HAVE__MEMAVL,[1],[Get system memory from windows API]) -fi + +case $host_os in + *mingw* ) + AC_DEFINE(HAVE__MEMAVL,1,[Get system memory from windows API]) +esac dnl Look for termios first (posix) AC_CHECK_HEADERS(termios.h termio.h sgtty.h , break) diff --git a/src/spicelib/devices/dev.c b/src/spicelib/devices/dev.c index ea4005695..4f0b9d67e 100644 --- a/src/spicelib/devices/dev.c +++ b/src/spicelib/devices/dev.c @@ -42,11 +42,13 @@ #ifdef XSPICE /*saj headers for xspice*/ #include /* for strcpy, strcat*/ -#ifndef HAS_WINDOWS +#if (!defined HAS_WINDOWS) && (!defined __MINGW32__) #include /* to load libraries*/ #else /* ifdef HAS_WINDOWS */ #include +#ifdef HAS_WINDOWS #include "wstdio.h" +#endif void *dlopen (const char *, int); void *dlsym (void *, const char *); int dlclose (void *);