From 1e5b3460c5213fa9d9e3b010a8b019129ab2de34 Mon Sep 17 00:00:00 2001
From: alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 24 Apr 2003 18:48:30 +0000
Subject: last mingw32 support patch by Sascha Sommer

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9979 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 loader/afl.c                   |  2 ++
 loader/com.h                   |  2 +-
 loader/dmo/DMO_VideoDecoder.c  |  2 ++
 loader/driver.c                |  2 ++
 loader/dshow/DS_VideoDecoder.c |  2 ++
 loader/wine/windef.h           | 18 +++++++++++++++---
 6 files changed, 24 insertions(+), 4 deletions(-)

(limited to 'loader')

diff --git a/loader/afl.c b/loader/afl.c
index aaef2ac2d4..ba27bc06f2 100644
--- a/loader/afl.c
+++ b/loader/afl.c
@@ -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 --git a/loader/com.h b/loader/com.h
index 4f8e180684..d9911317bc 100644
--- a/loader/com.h
+++ b/loader/com.h
@@ -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 --git a/loader/dmo/DMO_VideoDecoder.c b/loader/dmo/DMO_VideoDecoder.c
index 9c3fc474a8..8bad5379e9 100644
--- a/loader/dmo/DMO_VideoDecoder.c
+++ b/loader/dmo/DMO_VideoDecoder.c
@@ -49,7 +49,9 @@ struct _DMO_VideoDecoder
 #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 --git a/loader/driver.c b/loader/driver.c
index 4908f72513..041e80caea 100644
--- a/loader/driver.c
+++ b/loader/driver.c
@@ -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 --git a/loader/dshow/DS_VideoDecoder.c b/loader/dshow/DS_VideoDecoder.c
index cab9291929..5ed464f056 100644
--- a/loader/dshow/DS_VideoDecoder.c
+++ b/loader/dshow/DS_VideoDecoder.c
@@ -49,7 +49,9 @@ struct _DS_VideoDecoder
 #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 --git a/loader/wine/windef.h b/loader/wine/windef.h
index eff6a70038..51b1034eae 100644
--- a/loader/wine/windef.h
+++ b/loader/wine/windef.h
@@ -127,7 +127,7 @@ extern "C" {
 #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 @@ extern "C" {
 #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 @@ typedef LRESULT CALLBACK (*WNDPROC16)(HWND16,UINT16,WPARAM16,LPARAM);
 #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)
-- 
cgit v1.2.3