diff network.h @ 4206:c3102b189cb6 libavformat

Change semantic of CONFIG_*, HAVE_* and ARCH_*. They are now always defined to either 0 or 1.
author aurel
date Tue, 13 Jan 2009 23:44:16 +0000
parents 1b6245500d8c
children 77e0c7511d41
line wrap: on
line diff
--- a/network.h	Tue Jan 13 17:10:10 2009 +0000
+++ b/network.h	Tue Jan 13 23:44:16 2009 +0000
@@ -21,7 +21,7 @@
 #ifndef AVFORMAT_NETWORK_H
 #define AVFORMAT_NETWORK_H
 
-#ifdef HAVE_WINSOCK2_H
+#if HAVE_WINSOCK2_H
 #include <winsock2.h>
 #include <ws2tcpip.h>
 
@@ -38,7 +38,7 @@
 #define FF_NETERROR(err) err
 #endif
 
-#ifdef HAVE_ARPA_INET_H
+#if HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
 
@@ -46,7 +46,7 @@
 
 static inline int ff_network_init(void)
 {
-#ifdef HAVE_WINSOCK2_H
+#if HAVE_WINSOCK2_H
     WSADATA wsaData;
     if (WSAStartup(MAKEWORD(1,1), &wsaData))
         return 0;
@@ -56,12 +56,12 @@
 
 static inline void ff_network_close(void)
 {
-#ifdef HAVE_WINSOCK2_H
+#if HAVE_WINSOCK2_H
     WSACleanup();
 #endif
 }
 
-#if !defined(HAVE_INET_ATON)
+#if !HAVE_INET_ATON
 /* in os_support.c */
 int inet_aton (const char * str, struct in_addr * add);
 #endif