[MPlayer-dev-eng] [PATCH] Refreshed OS/2 Patches 1/3

[Dominik 'Rathann' Mierzejewski]

On Tuesday, 17 July 2007 at 15:38, KO Myung-Hun wrote:
> Hi/2.
> 
> I've splitted patches into 3 parts. This is 1/3.

> Index: stream/cache2.c
> ===================================================================
> --- stream/cache2.c	(revision 23794)
> +++ stream/cache2.c	(working copy)
[...]
> @@ -300,12 +314,17 @@
>      return 1; // parent exits
>    }
>    
> +#if defined(WIN32) || defined(__OS2__)
> +}
>  #ifdef WIN32
> -}
>  static DWORD WINAPI ThreadProc(void*s){
> +#else   // OS2
> +static void ThreadProc( void *s ){
>  #endif
> +#endif
>    
>  // cache thread mainloop:
> +
>    signal(SIGTERM,exit_sighandler); // kill
>    while(1){
>      if(!cache_fill((cache_vars_t*)s)){

cosmetics

> ===================================================================
> --- stream/tcp.c	(revision 23794)
> +++ stream/tcp.c	(working copy)
> @@ -34,6 +34,10 @@
>  
>  #include "tcp.h"
>  
> +#ifdef __OS2__
> +typedef int socklen_t;
> +#endif
> +
>  /* IPv6 options */
>  int   network_prefer_ipv4 = 0;
>  

This belongs to osdep/ directory, not tcp.c.

> Index: stream/librtsp/rtsp_rtp.c
> ===================================================================
> --- stream/librtsp/rtsp_rtp.c	(revision 23794)
> +++ stream/librtsp/rtsp_rtp.c	(working copy)
> @@ -45,6 +45,10 @@
>  #include "../freesdp/common.h"
>  #include "../freesdp/parser.h"
>  
> +#ifdef __OS2__
> +typedef int socklen_t;
> +#endif
> +
>  #define RTSP_DEFAULT_PORT 31336
>  #define MAX_LENGTH 256
>  

Likewise.

[...]
> Index: configure
> ===================================================================
> --- configure	(revision 23794)
> +++ configure	(working copy)
[...]
> @@ -6376,7 +6447,6 @@
>  fi
>  echores "$_libdv"
>  
> -
>  echocheck "XviD"
>  if test "$_xvid" = auto ; then
>    _xvid=no

Cosmetics.

Regards,
R.

-- 
MPlayer developer and RPMs maintainer: http://mplayerhq.hu http://rpm.livna.org
There should be a science of discontent. People need hard times and
oppression to develop psychic muscles.
	-- from "Collected Sayings of Muad'Dib" by the Princess Irulan