Socket.hpp   Socket.hpp 
skipping to change at line 34 skipping to change at line 34
#ifndef _SOCKET_HPP_ #ifndef _SOCKET_HPP_
#define _SOCKET_HPP_ #define _SOCKET_HPP_
#include <QtGlobal> #include <QtGlobal>
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
#include <winsock2.h> #include <winsock2.h>
#include <fcntl.h> #include <fcntl.h>
//FIXME: Remove these macro-redefinitions, we have no business messing with
them
//ESPECIALLY if the change the values and are not commented
#ifdef _MSC_VER
//for now, this warning is disabled when this header is included
#pragma warning(disable: 4005)
#endif
#define ERRNO WSAGetLastError() #define ERRNO WSAGetLastError()
#undef EAGAIN #undef EAGAIN
#define EAGAIN WSAEWOULDBLOCK #define EAGAIN WSAEWOULDBLOCK
#undef EINTR #undef EINTR
#define EINTR WSAEINTR #define EINTR WSAEINTR
#undef ECONNRESET #undef ECONNRESET
#define ECONNRESET WSAECONNRESET #define ECONNRESET WSAECONNRESET
static inline int SetNonblocking(int s) static inline int SetNonblocking(int s)
{ {
u_long arg = 1; u_long arg = 1;
skipping to change at line 58 skipping to change at line 65
#define close closesocket #define close closesocket
#define IS_INVALID_SOCKET(fd) (fd==INVALID_SOCKET) #define IS_INVALID_SOCKET(fd) (fd==INVALID_SOCKET)
#define STRERROR(x) x #define STRERROR(x) x
// #define DEBUG5 // #define DEBUG5
#else #else
#include <netdb.h> #include <netdb.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/select.h>
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
#include <string.h> // strerror #include <string.h> // strerror
#define ERRNO errno #define ERRNO errno
#define SETNONBLOCK(s) fcntl(s,F_SETFL,O_NONBLOCK) #define SETNONBLOCK(s) fcntl(s,F_SETFL,O_NONBLOCK)
#define SOCKLEN_T socklen_t #define SOCKLEN_T socklen_t
#define SOCKET int #define SOCKET int
#define IS_INVALID_SOCKET(fd) (fd<0) #define IS_INVALID_SOCKET(fd) (fd<0)
#define INVALID_SOCKET (-1) #define INVALID_SOCKET (-1)
 End of changes. 2 change blocks. 
0 lines changed or deleted 9 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/