Misplaced declaration of UpnpCloseSocket.

(cherry picked from commit 5b40cfa2720efa15513a43a507a343d4ffbe3953)
This commit is contained in:
Marcelo Roberto Jimenez 2010-10-15 12:17:15 -03:00
parent 6b496561b6
commit b6ec42b439
3 changed files with 8 additions and 16 deletions

View File

@ -12,8 +12,11 @@
#ifdef WIN32
#include <iphlpapi.h>
#include <winsock2.h>
#include <Ws2tcpip.h>
#define UpnpCloseSocket closesocket
#else
#include <sys/param.h>
#if (defined(BSD) && BSD >= 199306) || defined (__FreeBSD_kernel__)
@ -23,6 +26,10 @@
#include <sys/socket.h>
#endif
#include <netinet/in.h>
#define SOCKET int
#define INVALID_SOCKET ((SOCKET)(-1))
#define UpnpCloseSocket close
#endif

View File

@ -69,22 +69,6 @@
#endif
#ifdef WIN32
#include <iphlpapi.h>
#else
#define SOCKET int
#define INVALID_SOCKET (SOCKET)(~0)
#endif
#ifdef WIN32
#define UpnpCloseSocket closesocket
#define fseeko fseek
#else
#define UpnpCloseSocket close
#endif
#define LINE_SIZE 180
#define NAME_SIZE 256
#define MNFT_NAME_SIZE 64

View File

@ -68,6 +68,7 @@
#ifdef WIN32
#include <malloc.h>
#define fseeko fseek
#else
#include <arpa/inet.h>
#include <fcntl.h>