# HG changeset patch
# User alex
# Date 1051210110 0
# Node ID 11cee15b1a8fa8402b8d891fe4996a19810518ea
# Parent  16cacec38fc790062df16cf18a160b040db48166
last mingw32 support patch by Sascha Sommer

diff -r 16cacec38fc7 -r 11cee15b1a8f loader/afl.c
--- a/loader/afl.c	Thu Apr 24 18:35:21 2003 +0000
+++ b/loader/afl.c	Thu Apr 24 18:48:30 2003 +0000
@@ -31,7 +31,9 @@
 #include "wine/msacm.h"
 #include "wine/msacmdrv.h"
 #include "wineacm.h"
+#ifndef __MINGW32__
 #include "ext.h"
+#endif
 #include "driver.h"
 
 #include <stdio.h>
diff -r 16cacec38fc7 -r 11cee15b1a8f loader/com.h
--- a/loader/com.h	Thu Apr 24 18:35:21 2003 +0000
+++ b/loader/com.h	Thu Apr 24 18:48:30 2003 +0000
@@ -13,7 +13,7 @@
  * Internal functions and structures for COM emulation code.
  */
 
-#if !defined(WIN32) || defined(__CYGWIN__) || defined(__MINGW32)
+#if !defined(WIN32) || defined(__CYGWIN__) || defined(__MINGW32__)
 
 #ifdef __cplusplus
 extern "C" {
diff -r 16cacec38fc7 -r 11cee15b1a8f loader/dmo/DMO_VideoDecoder.c
--- a/loader/dmo/DMO_VideoDecoder.c	Thu Apr 24 18:35:21 2003 +0000
+++ b/loader/dmo/DMO_VideoDecoder.c	Thu Apr 24 18:48:30 2003 +0000
@@ -49,7 +49,9 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <sys/types.h>
+#ifndef __MINGW32__
 #include <sys/mman.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>  // labs
 
diff -r 16cacec38fc7 -r 11cee15b1a8f loader/driver.c
--- a/loader/driver.c	Thu Apr 24 18:35:21 2003 +0000
+++ b/loader/driver.c	Thu Apr 24 18:48:30 2003 +0000
@@ -19,7 +19,9 @@
 #include "ldt_keeper.h"
 #endif
 #include "driver.h"
+#ifndef __MINGW32__
 #include "ext.h"
+#endif
 
 #ifndef WIN32_LOADER
 char* def_path=WIN32_PATH;
diff -r 16cacec38fc7 -r 11cee15b1a8f loader/dshow/DS_VideoDecoder.c
--- a/loader/dshow/DS_VideoDecoder.c	Thu Apr 24 18:35:21 2003 +0000
+++ b/loader/dshow/DS_VideoDecoder.c	Thu Apr 24 18:48:30 2003 +0000
@@ -49,7 +49,9 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <sys/types.h>
+#ifndef __MINGW32__
 #include <sys/mman.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>  // labs
 
diff -r 16cacec38fc7 -r 11cee15b1a8f loader/wine/windef.h
--- a/loader/wine/windef.h	Thu Apr 24 18:35:21 2003 +0000
+++ b/loader/wine/windef.h	Thu Apr 24 18:48:30 2003 +0000
@@ -127,7 +127,7 @@
 #define PASCAL      __stdcall
 #define pascal      __stdcall
 #define _pascal     __stdcall
-#if !defined(__CYGWIN__)
+#if !defined(__CYGWIN__) && !defined(__MINGW32__)
 #define _stdcall    __stdcall
 #define _fastcall   __stdcall
 #define __fastcall  __stdcall
@@ -136,13 +136,13 @@
 #define CDECL       __cdecl
 #define _CDECL      __cdecl
 #define cdecl       __cdecl
-#if !defined(__CYGWIN__)
+#if !defined(__CYGWIN__) && !defined(__MINGW32__)
 #define _cdecl      __cdecl
 #endif
 #define WINAPIV     __cdecl
 #define APIENTRY    WINAPI
 
-#if !defined(__CYGWIN__)
+#if !defined(__CYGWIN__) && !defined(__MINGW32__)
 #define __declspec(x)
 #endif
 #define dllimport
@@ -570,12 +570,24 @@
 #define min(a,b)   (((a) < (b)) ? (a) : (b))
 #endif
 
+#ifndef _MAX_PATH
 #define _MAX_PATH  260
+#endif
+#ifndef MAX_PATH
 #define MAX_PATH   260
+#endif
+#ifndef _MAX_DRIVE
 #define _MAX_DRIVE 3
+#endif
+#ifndef _MAX_DIR
 #define _MAX_DIR   256
+#endif
+#ifndef _MAX_FNAME
 #define _MAX_FNAME 255
+#endif
+#ifndef _MAX_EXT
 #define _MAX_EXT   256
+#endif
 
 #define HFILE_ERROR16   ((HFILE16)-1)
 #define HFILE_ERROR     ((HFILE)-1)