Fix the logic to access the location of a string to free when setting

[ffmpeg] / libavformat / os_support.h

diff --git a/libavformat/os_support.h b/libavformat/os_support.h
index 05acaa152aab45c24db920c63c7e9da38ba635ec..34970e39520c8707ef322dac085b4bb7f7a07969 100644 (file)
--- a/libavformat/os_support.h
+++ b/libavformat/os_support.h
@@ -19,42 +19,26 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef OS_SUPPORT_H
-#define OS_SUPPORT_H
+#ifndef FFMPEG_OS_SUPPORT_H
+#define FFMPEG_OS_SUPPORT_H
 
 /**
  * @file os_support.h
  * miscellaneous OS support macros and functions.
- *
- * - socklen_t typedef (BeOS, Innotek libc)
- * - usleep() (Win32, BeOS, OS/2)
- * - lseek() (Win32)
- * - floatf() (OS/2)
- * - strcasecmp() (OS/2)
- * - closesocket()
- * - poll() (BeOS, MinGW)
  */
 
-#if defined(__BEOS__) || defined(__INNOTEK_LIBC__)
-typedef int socklen_t;
-#endif
-
 #ifdef __MINGW32__
-__declspec(dllimport) void __stdcall Sleep(unsigned long dwMilliseconds);
-// #  include <windows.h>
+#  define WIN32_LEAN_AND_MEAN
+#  include <windows.h>
 #  define usleep(t)    Sleep((t) / 1000)
 #  include <fcntl.h>
 #  define lseek(f,p,w) _lseeki64((f), (p), (w))
-#  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
@@ -68,25 +52,24 @@ __declspec(dllimport) void __stdcall Sleep(unsigned long dwMilliseconds);
 #  endif
 #endif
 
-#if defined(CONFIG_OS2)
-#include <stdlib.h>
-static inline int usleep(unsigned int t) { return _sleep2(t / 1000); }
-static inline int strcasecmp(const char* s1, const char* s2) { return stricmp(s1,s2); }
+#ifdef CONFIG_NETWORK
+#ifndef HAVE_SOCKLEN_T
+typedef int socklen_t;
 #endif
 
 /* most of the time closing a socket is just closing an fd */
-#if HAVE_CLOSESOCKET != 1
+#ifndef HAVE_CLOSESOCKET
 #define closesocket close
 #endif
 
 #ifdef CONFIG_FFSERVER
-#ifndef HAVE_SYS_POLL_H
+#ifndef HAVE_POLL_H
 typedef unsigned long nfds_t;
 
 struct pollfd {
     int fd;
     short events;  /* events to look for */
-    short revents; /* events that occured */
+    short revents; /* events that occurred */
 };
 
 /* events & revents */
@@ -105,7 +88,8 @@ struct pollfd {
 
 
 extern int poll(struct pollfd *fds, nfds_t numfds, int timeout);
-#endif /* HAVE_SYS_POLL_H */
+#endif /* HAVE_POLL_H */
 #endif /* CONFIG_FFSERVER */
+#endif /* CONFIG_NETWORK */
 
-#endif /* OS_SUPPORT_H */
+#endif /* FFMPEG_OS_SUPPORT_H */