os_support: define socket shutdown SHUT_xxx macros if they are not defined
authorPeter Ross <pross@xvid.org>
Sat, 24 Nov 2018 12:26:13 +0000 (23:26 +1100)
committerPeter Ross <pross@xvid.org>
Tue, 11 Dec 2018 11:08:18 +0000 (22:08 +1100)
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.

libavformat/os_support.h

index 7a56dc9..5e6b32d 100644 (file)
@@ -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