[FFmpeg-devel] [PATCH] socklen_t definition

[Michael Niedermayer]

On Sun, Dec 23, 2007 at 06:08:37PM -0800, Dave Yeo wrote:
> With more talk about libossupport I thought it might be a good time to 
> resurrect KO Myung-Hun's socklen_t patch. Still typedefs it to int as that 
> is what OS/2 and Beos use.
> Not sure about the windows bit that KO added.
> Dave

[configure i dont maintain]

> ===================================================================
> --- libavformat/rtpproto.c	(revision 11311)
> +++ libavformat/rtpproto.c	(working copy)
> @@ -24,7 +24,6 @@
>  #include <unistd.h>
>  #include <stdarg.h>
>  #include "network.h"
> -#include "os_support.h"
>  #include <fcntl.h>
>  
>  #define RTP_TX_BUF_SIZE  (64 * 1024)

unrelated


> Index: libavformat/network.h
> ===================================================================
> --- libavformat/network.h	(revision 11311)
> +++ libavformat/network.h	(working copy)
> @@ -42,6 +42,10 @@
>  #include <arpa/inet.h>
>  #endif
>  
> +#ifndef HAVE_SOCKLEN_T
> +#include "os_support.h"
> +#endif
> +
>  int ff_socket_nonblock(int socket, int enable);
>  
>  static inline int ff_network_init(void)

unrelated


> Index: libavformat/os_support.h
> ===================================================================
> --- libavformat/os_support.h	(revision 11311)
> +++ libavformat/os_support.h	(working copy)
> @@ -27,7 +27,7 @@
>   * miscellaneous OS support macros and functions.
>   */
>  
> -#if defined(__BEOS__) || defined(__INNOTEK_LIBC__)
> +#ifndef HAVE_SOCKLEN_T
>  typedef int socklen_t;
>  #endif

probably ok


>  
> Index: libavformat/tcp.c
> ===================================================================
> --- libavformat/tcp.c	(revision 11311)
> +++ libavformat/tcp.c	(working copy)
> @@ -21,7 +21,6 @@
>  #include "avformat.h"
>  #include <unistd.h>
>  #include "network.h"
> -#include "os_support.h"
>  #include <sys/time.h>
>  
>  typedef struct TCPContext {

unrelated


[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Frequently ignored awnser#1 FFmpeg bugs should be sent to our bugtracker, user
questions for the command line tools ffmpeg, ffplay, ... as well as questions
about how to use libav* should be sent to the ffmpeg-user mailinglist.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20071230/504d0c7e/attachment.pgp>