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

[KO Myung-Hun]

Hi/2.

Diego Biurrun wrote:
> 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.
>   

Ok. I've splitted those into 2 parts as suggestion of Michael.

>   
>> --- 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.
>
>   

Thanks.

>> --- 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.
>   

I did it to distinguish <> style header and "" style header, but Ok. It 
is in mmap.diff

>   
>> --- 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?
>   

Default output of gcc on OS/2 is a.out format. But overall format of 
MPlayer OS/2 port require OMF format. So without that, librarian cannot 
recognize it.

-- 
KO Myung-Hun

Using Mozilla SeaMonkey 1.1.8
Under OS/2 Warp 4 for Korean with FixPak #15
On AMD ThunderBird 1 GHz with 512 MB RAM

Korean OS/2 User Community : http://www.ecomstation.co.kr


-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: mmap.diff
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/attachments/20080301/2188765c/attachment.asc>
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: loader.diff
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/attachments/20080301/2188765c/attachment.txt>