[FFmpeg-cvslog] avformat/network: move sockaddr_union after sockaddr_storage compatibility code

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep 16 01:00:49 2014 +0200| [b76d6132e385fc4d05b42b03caa82eca3025092e] | committer: Michael Niedermayer

avformat/network: move sockaddr_union after sockaddr_storage compatibility code

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/network.h |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/libavformat/network.h b/libavformat/network.h
index d4e1a89..0d1081a 100644
--- a/libavformat/network.h
+++ b/libavformat/network.h
@@ -72,14 +72,6 @@ int ff_neterrno(void);
 #include <poll.h>
 #endif
 
-typedef union sockaddr_union {
-    struct sockaddr_storage storage;
-    struct sockaddr_in in;
-#if HAVE_STRUCT_SOCKADDR_IN6
-    struct sockaddr_in6 in6;
-#endif
-} sockaddr_union;
-
 int ff_socket_nonblock(int socket, int enable);
 
 extern int ff_network_inited_globally;
@@ -119,6 +111,14 @@ struct sockaddr_storage {
 };
 #endif /* !HAVE_STRUCT_SOCKADDR_STORAGE */
 
+typedef union sockaddr_union {
+    struct sockaddr_storage storage;
+    struct sockaddr_in in;
+#if HAVE_STRUCT_SOCKADDR_IN6
+    struct sockaddr_in6 in6;
+#endif
+} sockaddr_union;
+
 #ifndef MSG_NOSIGNAL
 #define MSG_NOSIGNAL 0
 #endif