[FFmpeg-cvslog] r25035 - in trunk/libavformat: network.h os_support.h

rbultje subversion
Fri Sep 3 22:06:01 CEST 2010


Author: rbultje
Date: Fri Sep  3 22:06:01 2010
New Revision: 25035

Log:
Move INET6_ADDRSTRLEN to network.h, similar to other network-related fixups
for broken OSes. This is included in rtsp.h, as opposed to os_support.h.
Should fix OS/2 broken build on fate.

Modified:
   trunk/libavformat/network.h
   trunk/libavformat/os_support.h

Modified: trunk/libavformat/network.h
==============================================================================
--- trunk/libavformat/network.h	Fri Sep  3 21:30:27 2010	(r25034)
+++ trunk/libavformat/network.h	Fri Sep  3 22:06:01 2010	(r25035)
@@ -151,4 +151,8 @@ const char *ff_gai_strerror(int ecode);
 #define gai_strerror ff_gai_strerror
 #endif
 
+#ifndef INET6_ADDRSTRLEN
+#define INET6_ADDRSTRLEN INET_ADDRSTRLEN
+#endif
+
 #endif /* AVFORMAT_NETWORK_H */

Modified: trunk/libavformat/os_support.h
==============================================================================
--- trunk/libavformat/os_support.h	Fri Sep  3 21:30:27 2010	(r25034)
+++ trunk/libavformat/os_support.h	Fri Sep  3 22:06:01 2010	(r25035)
@@ -55,10 +55,6 @@ typedef int socklen_t;
 #define closesocket close
 #endif
 
-#ifndef INET6_ADDRSTRLEN
-#define INET6_ADDRSTRLEN INET_ADDRSTRLEN
-#endif
-
 #if CONFIG_FFSERVER
 #if !HAVE_POLL_H
 typedef unsigned long nfds_t;



More information about the ffmpeg-cvslog mailing list