[vlc-commits] commit: Do not redefine standard types ( Rémi Denis-Courmont )

git at videolan.org git at videolan.org
Sat Nov 6 12:25:03 CET 2010


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Nov  6 13:02:34 2010 +0200| [e8da701b61fa7928611f12c5c273851055ac8ac7] | committer: Rémi Denis-Courmont 

Do not redefine standard types

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e8da701b61fa7928611f12c5c273851055ac8ac7
---

 include/vlc_common.h |    2 --
 include/vlc_sout.h   |    2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 8844d23..21bf5ae 100644
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -312,8 +312,6 @@ typedef struct filter_sys_t filter_sys_t;
 /* Network */
 typedef struct network_socket_t network_socket_t;
 typedef struct virtual_socket_t v_socket_t;
-typedef struct sockaddr sockaddr;
-typedef struct addrinfo addrinfo;
 typedef struct vlc_acl_t vlc_acl_t;
 typedef struct vlc_url_t vlc_url_t;
 
diff --git a/include/vlc_sout.h b/include/vlc_sout.h
index 3a336bb..50704c1 100644
--- a/include/vlc_sout.h
+++ b/include/vlc_sout.h
@@ -261,6 +261,8 @@ VLC_EXPORT(void,                 sout_MethodRelease, (announce_method_t *) );
 
 /** SDP */
 
+struct sockaddr;
+
 VLC_EXPORT( char *, vlc_sdp_Start, ( vlc_object_t *obj, const char *cfgpref, const struct sockaddr *src, size_t srclen, const struct sockaddr *addr, size_t addrlen ) LIBVLC_USED );
 VLC_EXPORT( char *, sdp_AddMedia, (char **sdp, const char *type, const char *protocol, int dport, unsigned pt, bool bw_indep, unsigned bw, const char *ptname, unsigned clockrate, unsigned channels, const char *fmtp) );
 VLC_EXPORT( char *, sdp_AddAttribute, (char **sdp, const char *name, const char *fmt, ...) LIBVLC_FORMAT( 3, 4 ) );



More information about the vlc-commits mailing list