diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-13 23:44:16 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-13 23:44:16 +0000 |
| commit | b250f9c66d3ddd84652d158fb979a5f21e3f2c71 (patch) | |
| tree | ef84366029d6f8af6ed82e90c5f188bb7dfc844d /libavformat/network.h | |
| parent | 959da985b03570cfe7d239c0ba6d550ecb04c460 (diff) | |
| download | ffmpeg-b250f9c66d3ddd84652d158fb979a5f21e3f2c71.tar.gz | |
Change semantic of CONFIG_*, HAVE_* and ARCH_*.
They are now always defined to either 0 or 1.
Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/network.h')
| -rw-r--r-- | libavformat/network.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/network.h b/libavformat/network.h index a5904d93af..ef08b557e9 100644 --- a/libavformat/network.h +++ b/libavformat/network.h @@ -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 @@ int ff_socket_nonblock(int socket, int enable); 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 int ff_network_init(void) 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 |