Change semantic of CONFIG_*, HAVE_* and ARCH_*.

[ffmpeg] / libavformat / os_support.h

diff --git a/libavformat/os_support.h b/libavformat/os_support.h
index 34970e39520c8707ef322dac085b4bb7f7a07969..165dc23a0652a19878a5dbdfaef99b384562112e 100644 (file)
--- a/libavformat/os_support.h
+++ b/libavformat/os_support.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_OS_SUPPORT_H
-#define FFMPEG_OS_SUPPORT_H
+#ifndef AVFORMAT_OS_SUPPORT_H
+#define AVFORMAT_OS_SUPPORT_H
 
 /**
  * @file os_support.h
@@ -28,13 +28,19 @@
  */
 
 #ifdef __MINGW32__
-#  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))
 #endif
 
+static inline int is_dos_path(const char *path)
+{
+#if HAVE_DOS_PATHS
+    if (path[0] && path[1] == ':')
+        return 1;
+#endif
+    return 0;
+}
+
 #ifdef __BEOS__
 #  include <sys/socket.h>
 #  include <netinet/in.h>
@@ -52,18 +58,18 @@
 #  endif
 #endif
 
-#ifdef CONFIG_NETWORK
-#ifndef HAVE_SOCKLEN_T
+#if CONFIG_NETWORK
+#if !HAVE_SOCKLEN_T
 typedef int socklen_t;
 #endif
 
 /* most of the time closing a socket is just closing an fd */
-#ifndef HAVE_CLOSESOCKET
+#if !HAVE_CLOSESOCKET
 #define closesocket close
 #endif
 
-#ifdef CONFIG_FFSERVER
-#ifndef HAVE_POLL_H
+#if CONFIG_FFSERVER
+#if !HAVE_POLL_H
 typedef unsigned long nfds_t;
 
 struct pollfd {
@@ -87,9 +93,9 @@ struct pollfd {
 #define POLLNVAL   0x1000  /* invalid file descriptor */
 
 
-extern int poll(struct pollfd *fds, nfds_t numfds, int timeout);
+int poll(struct pollfd *fds, nfds_t numfds, int timeout);
 #endif /* HAVE_POLL_H */
 #endif /* CONFIG_FFSERVER */
 #endif /* CONFIG_NETWORK */
 
-#endif /* FFMPEG_OS_SUPPORT_H */
+#endif /* AVFORMAT_OS_SUPPORT_H */