aboutsummaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorAlex Beregszaszi2007-08-08 20:25:32 +0000
committerAlex Beregszaszi2007-08-08 20:25:32 +0000
commit3cf9ea7f48b72f24061f4ebbe4a4db83897168fd (patch)
treed916cdd429f4c55a1100e7087ae0954f2c5db62c /libavformat
parentecf97f22b368b70e90055bf8606b5e41e0b5fbd3 (diff)
use proper closesocket defines
Originally committed as revision 9992 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/os_support.h9
1 files changed, 1 insertions, 8 deletions
diff --git a/libavformat/os_support.h b/libavformat/os_support.h
index 30c069d78b..029223a56c 100644
--- a/libavformat/os_support.h
+++ b/libavformat/os_support.h
@@ -45,17 +45,10 @@ __declspec(dllimport) void __stdcall Sleep(unsigned long dwMilliseconds);
# define lseek(f,p,w) _lseeki64((f), (p), (w))
#endif
-#ifdef HAVE_WINSOCK2_H
-# define HAVE_CLOSESOCKET 1
-#endif
-
#ifdef __BEOS__
# include <sys/socket.h>
# include <netinet/in.h>
/* not net_server ? */
-# if IPPROTO_TCP != 6
-# define HAVE_CLOSESOCKET 1
-# endif
# include <BeBuild.h>
/* R5 didn't have usleep, fake it. Haiku and Zeta has it now. */
# if B_BEOS_VERSION <= B_BEOS_VERSION_5
@@ -70,7 +63,7 @@ __declspec(dllimport) void __stdcall Sleep(unsigned long dwMilliseconds);
#endif
/* most of the time closing a socket is just closing an fd */
-#if HAVE_CLOSESOCKET != 1
+#ifndef HAVE_CLOSESOCKET
#define closesocket close
#endif