[MPlayer-dev-eng] [PATCH] Win32 loader for OS/2

[Diego Biurrun]

On Fri, Feb 29, 2008 at 11:59:12AM +0900, KO Myung-Hun wrote:
> 
> These patches enable Win32 loader support for OS/2

These patches are actually a single patch although they would better be
several small patches.

> --- loader/dmo/DMO_VideoDecoder.c   (revision 26108)
> +++ loader/dmo/DMO_VideoDecoder.c   (working copy)
> @@ -39,7 +39,7 @@
>  #include <fcntl.h>
>  #include <errno.h>
>  #include <sys/types.h>
> -#ifndef __MINGW32__
> +#ifdef HAVE_SYS_MMAN_H
>  #include <sys/mman.h>
>  #endif
>  #include <stdio.h>

Applied these parts.

> --- loader/ext.c    (revision 26108)
> +++ loader/ext.c    (working copy)
> @@ -18,13 +18,18 @@
>  #include <malloc.h>
>  #endif
>  #include <unistd.h>
> +#ifdef HAVE_SYS_MMAN_H
>  #include <sys/mman.h>
> +#endif
>  #include <errno.h>
>  #include <fcntl.h>
>  #include <string.h>
>  #include <stdarg.h>
>  #include <ctype.h>
>  
> +#ifndef HAVE_SYS_MMAN_H
> +#include "osdep/mmap.h"
> +#endif
>  #include "osdep/mmap_anon.h"
>  #include "wine/windef.h"
>  #include "wine/winbase.h"
> --- loader/win32.c  (revision 26108)
> +++ loader/win32.c  (working copy)
> @@ -68,7 +68,11 @@
>  #include <kstat.h>
>  #endif
>  
> +#ifdef HAVE_SYS_MMAN_H
>  #include <sys/mman.h>
> +#else
> +#include "osdep/mmap.h"
> +#endif
>  #include "osdep/mmap_anon.h"

You are inconsistent between those two files, use the #else construct
everywhere.

> --- loader/Makefile (revision 26108)
> +++ loader/Makefile (working copy)
> @@ -35,6 +35,11 @@
>  
> +ifeq ($(TARGET_OS),OS/2)
> +wrapper.o : wrapper.S
> +   $(CC) -Zomf -c -o $@ $^
> +endif

What's the problem here?

Diego