MingW fixes

git-svn-id: svn://svn.cc65.org/cc65/trunk@447 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/src/ar65/objfile.c b/src/ar65/objfile.c
index 93fcfbf429a39ee86c4a4b00b5273d698a12dc37..1f5bd8abec176c674e9becc506d1697a62460261 100644 (file)
--- a/src/ar65/objfile.c
+++ b/src/ar65/objfile.c
@@ -35,7 +35,7 @@
 
 #include <string.h>
 #include <errno.h>
-#if defined(__WATCOMC__) || defined(_MSC_VER)
+#if defined(__WATCOMC__) || defined(_MSC_VER) || defined(__MINGW32__)
 /* The Windows compilers have the file in the wrong directory */
 #  include <sys/utime.h>
 #else
@@ -45,8 +45,10 @@
 #include <time.h>
 #include <sys/stat.h>
 
-#include "../common/xmalloc.h"
+/* common */
+#include "xmalloc.h"
 
+/* ar65 */
 #include "error.h"
 #include "objdata.h"
 #include "fileio.h"

diff --git a/src/cl65/main.c b/src/cl65/main.c
index 62ce40e2eec87ad901d8c2f3d5aca011d9001298..2f2003eacebcdce01ba8cdf730b875a7501dd016 100644 (file)
--- a/src/cl65/main.c
+++ b/src/cl65/main.c
@@ -38,7 +38,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>
-#if defined(__WATCOMC__) || defined(_MSC_VER)
+#if defined(__WATCOMC__) || defined(_MSC_VER) || defined(__MINGW32__)
 #  include <process.h>         /* DOS, OS/2 and Windows */
 #else
 #  include "spawn.h"           /* All others */
@@ -336,7 +336,7 @@ static void Link (void)
 {
     unsigned I;
 
-    /* If we have a linker config file given, add it to the command line. 
+    /* If we have a linker config file given, add it to the command line.
      * Otherwise pass the target to the linker if we have one.
      */
     if (LinkerConfig) {

diff --git a/src/common/xsprintf.c b/src/common/xsprintf.c
index 4d891ad8bcce90ae4f6133853eeedd85f4b0adb3..1f85c65a4c3cc5518a6c0755bdf92314613cbca9 100644 (file)
--- a/src/common/xsprintf.c
+++ b/src/common/xsprintf.c
@@ -66,7 +66,7 @@ int xvsprintf (char* Buf, size_t BufSize, const char* Format, va_list ap)
 {
 #if defined(__WATCOMC__)
     int Res = _vbprintf (Buf, BufSize, Format, ap);
-#elif defined(__GNUC__) && !defined(__GO32__)
+#elif defined(__GNUC__) && !defined(__GO32__) && !defined(__MINGW32__)
     int Res = vsnprintf (Buf, BufSize, Format, ap);
 #elif defined(_MSC_VER)
     int Res = _vsnprintf (Buf, BufSize, Format, ap);