[FFmpeg-cvslog] os_support: define socket shutdown SHUT_xxx macros if they are not defined

Peter Ross git at videolan.org
Tue Dec 11 13:22:41 EET 2018


ffmpeg | branch: master | Peter Ross <pross at xvid.org> | Sat Nov 24 23:26:13 2018 +1100| [b41f378fc4ddb1a34aebe459805d3c8dbcc96b36] | committer: Peter Ross

os_support: define socket shutdown SHUT_xxx macros if they are not defined

this section has been moved into the CONFIG_NETWORK block, since it only
affects network enabled builds.

sys/socket.h (with WIN32 guard) is needed to check if the SHUT_xxx macro exists.

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

 libavformat/os_support.h | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/libavformat/os_support.h b/libavformat/os_support.h
index 7a56dc9a7c..5e6b32d2dc 100644
--- a/libavformat/os_support.h
+++ b/libavformat/os_support.h
@@ -76,17 +76,7 @@ static inline int is_dos_path(const char *path)
     return 0;
 }
 
-#if defined(__OS2__)
-#define SHUT_RD 0
-#define SHUT_WR 1
-#define SHUT_RDWR 2
-#endif
-
 #if defined(_WIN32)
-#define SHUT_RD SD_RECEIVE
-#define SHUT_WR SD_SEND
-#define SHUT_RDWR SD_BOTH
-
 #ifndef S_IRUSR
 #define S_IRUSR S_IREAD
 #endif
@@ -96,6 +86,19 @@ static inline int is_dos_path(const char *path)
 #endif
 
 #if CONFIG_NETWORK
+#if defined(_WIN32)
+#define SHUT_RD SD_RECEIVE
+#define SHUT_WR SD_SEND
+#define SHUT_RDWR SD_BOTH
+#else
+#include <sys/socket.h>
+#if !defined(SHUT_RD) /* OS/2, DJGPP */
+#define SHUT_RD 0
+#define SHUT_WR 1
+#define SHUT_RDWR 2
+#endif
+#endif
+
 #if !HAVE_SOCKLEN_T
 typedef int socklen_t;
 #endif



More information about the ffmpeg-cvslog mailing list