X-Git-Url: http://sjero.net/git/?p=iperf;a=blobdiff_plain;f=include%2Fheaders.h;fp=include%2Fheaders.h;h=6bf6da8462081b80b6b7c4b716619a2a39372b8b;hp=657674f7c9fbb9f45af1194506695fcaf5d06d35;hb=0b373e070771aa2bc368ec82dbd4f48e69f5faf9;hpb=160c6a5bab3ab731f5b1ad8bc174e7d087ca7acb diff --git a/include/headers.h b/include/headers.h index 657674f..6bf6da8 100644 --- a/include/headers.h +++ b/include/headers.h @@ -84,44 +84,6 @@ #include #include -#ifdef WIN32 - -/* Windows config file */ - #include "config.win32.h" - -/* Windows headers */ - #define _WIN32_WINNT 0x0400 /* use (at least) WinNT 4.0 API */ - #define WIN32_LEAN_AND_MEAN /* exclude unnecesary headers */ - #include - #include - #include - -/* define EINTR, just to help compile; it isn't useful */ - #ifndef EINTR - #define EINTR WSAEINTR - #endif // EINTR - -/* Visual C++ has INT64, but not 'long long'. - * Metrowerks has 'long long', but INT64 doesn't work. */ - #ifdef __MWERKS__ - #define int64_t long long - #else - #define int64_t INT64 - #endif // __MWERKS__ - -/* Visual C++ has _snprintf instead of snprintf */ - #ifndef __MWERKS__ - #define snprintf _snprintf - #endif // __MWERKS__ - -/* close, read, and write only work on files in Windows. - * I get away with #defining them because I don't read files. */ - #define close( s ) closesocket( s ) - #define read( s, b, l ) recv( s, (char*) b, l, 0 ) - #define write( s, b, l ) send( s, (char*) b, l, 0 ) - -#else /* not defined WIN32 */ - /* required on AIX for FD_SET (requires bzero). * often this is the same as */ #ifdef HAVE_STRINGS_H @@ -157,8 +119,6 @@ SPECIAL_OSF1_EXTERN_C_STOP #define SOCKET_ERROR -1 #define INVALID_SOCKET -1 -#endif /* not defined WIN32 */ - #ifndef INET6_ADDRSTRLEN #define INET6_ADDRSTRLEN 40 #endif