Permalink
Browse files

Revert "PACK should be defined different for Win32 based on whether"

This reverts commit 553c708.
  • Loading branch information...
twinaphex committed Aug 30, 2017
1 parent 553c708 commit 7424e6485ff0692451c6c7d8f8883534ea869fb2
Showing with 2 additions and 8 deletions.
  1. +2 −8 Core/HLE/proAdhoc.h
View
@@ -51,6 +51,7 @@ class PointerWrap;
#include <errno.h>
#endif
#ifdef _WIN32
#define PACK
#undef errno
#undef ECONNABORTED
#undef ECONNRESET
@@ -72,15 +73,8 @@ inline bool connectInProgress(int errcode){ return (errcode == WSAEWOULDBLOCK ||
#define INVALID_SOCKET -1
#define SOCKET_ERROR -1
#define closesocket close
inline bool connectInProgress(int errcode){ return (errcode == EINPROGRESS || errcode == EALREADY); }
#endif
#ifdef _WIN32
#ifdef _MSC_VER
#define PACK
#else
#define PACK __attribute__((packed))
#endif
inline bool connectInProgress(int errcode){ return (errcode == EINPROGRESS || errcode == EALREADY); }
#endif
#ifndef POLL_ERR

0 comments on commit 7424e64

Please sign in to comment.