From 98873b593a4c2110737a80b6816da1c0dee32cbf Mon Sep 17 00:00:00 2001
From: Alex Szpakowski <slime73@gmail.com>
Date: Wed, 12 Mar 2014 02:55:03 -0300
Subject: [PATCH] Updated ENet to version 1.3.11

---
 src/libraries/enet/libenet/ChangeLog               | 6 ++++++
 src/libraries/enet/libenet/include/enet/enet.h     | 2 +-
 src/libraries/enet/libenet/include/enet/protocol.h | 4 ++--
 src/libraries/enet/libenet/include/enet/unix.h     | 2 +-
 src/libraries/enet/libenet/include/enet/win32.h    | 2 +-
 src/libraries/enet/libenet/protocol.c              | 5 +++--
 6 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/libraries/enet/libenet/ChangeLog b/src/libraries/enet/libenet/ChangeLog
index c8f91a090..5277b2c9a 100644
--- a/src/libraries/enet/libenet/ChangeLog
+++ b/src/libraries/enet/libenet/ChangeLog
@@ -1,3 +1,9 @@
+ENet 1.3.11 (December 26, 2013):
+
+* allow an ENetHost to connect to itself
+* fixed possible bug with disconnect notifications during connect attempts
+* fixed some preprocessor definition bugs
+
 ENet 1.3.10 (October 23, 2013);
 
 * doubled maximum reliable window size
diff --git a/src/libraries/enet/libenet/include/enet/enet.h b/src/libraries/enet/libenet/include/enet/enet.h
index 4dda5517d..d5d5b8feb 100644
--- a/src/libraries/enet/libenet/include/enet/enet.h
+++ b/src/libraries/enet/libenet/include/enet/enet.h
@@ -25,7 +25,7 @@ extern "C"
 
 #define ENET_VERSION_MAJOR 1
 #define ENET_VERSION_MINOR 3
-#define ENET_VERSION_PATCH 10
+#define ENET_VERSION_PATCH 11
 #define ENET_VERSION_CREATE(major, minor, patch) (((major)<<16) | ((minor)<<8) | (patch))
 #define ENET_VERSION_GET_MAJOR(version) (((version)>>16)&0xFF)
 #define ENET_VERSION_GET_MINOR(version) (((version)>>8)&0xFF)
diff --git a/src/libraries/enet/libenet/include/enet/protocol.h b/src/libraries/enet/libenet/include/enet/protocol.h
index b8f841629..a7c73c690 100644
--- a/src/libraries/enet/libenet/include/enet/protocol.h
+++ b/src/libraries/enet/libenet/include/enet/protocol.h
@@ -54,7 +54,7 @@ typedef enum _ENetProtocolFlag
    ENET_PROTOCOL_HEADER_SESSION_SHIFT   = 12
 } ENetProtocolFlag;
 
-#ifdef _MSC_VER_
+#ifdef _MSC_VER
 #pragma pack(push, 1)
 #define ENET_PACKED
 #elif defined(__GNUC__) || defined(__clang__)
@@ -191,7 +191,7 @@ typedef union _ENetProtocol
    ENetProtocolThrottleConfigure throttleConfigure;
 } ENET_PACKED ENetProtocol;
 
-#ifdef _MSC_VER_
+#ifdef _MSC_VER
 #pragma pack(pop)
 #endif
 
diff --git a/src/libraries/enet/libenet/include/enet/unix.h b/src/libraries/enet/libenet/include/enet/unix.h
index 9683c09b4..a59e34060 100644
--- a/src/libraries/enet/libenet/include/enet/unix.h
+++ b/src/libraries/enet/libenet/include/enet/unix.h
@@ -40,7 +40,7 @@ typedef fd_set ENetSocketSet;
 
 #define ENET_SOCKETSET_EMPTY(sockset)          FD_ZERO (& (sockset))
 #define ENET_SOCKETSET_ADD(sockset, socket)    FD_SET (socket, & (sockset))
-#define ENET_SOCKETSET_REMOVE(sockset, socket) FD_CLEAR (socket, & (sockset))
+#define ENET_SOCKETSET_REMOVE(sockset, socket) FD_CLR (socket, & (sockset))
 #define ENET_SOCKETSET_CHECK(sockset, socket)  FD_ISSET (socket, & (sockset))
     
 #endif /* __ENET_UNIX_H__ */
diff --git a/src/libraries/enet/libenet/include/enet/win32.h b/src/libraries/enet/libenet/include/enet/win32.h
index 197dfc047..d8968ee56 100644
--- a/src/libraries/enet/libenet/include/enet/win32.h
+++ b/src/libraries/enet/libenet/include/enet/win32.h
@@ -50,7 +50,7 @@ typedef fd_set ENetSocketSet;
 
 #define ENET_SOCKETSET_EMPTY(sockset)          FD_ZERO (& (sockset))
 #define ENET_SOCKETSET_ADD(sockset, socket)    FD_SET (socket, & (sockset))
-#define ENET_SOCKETSET_REMOVE(sockset, socket) FD_CLEAR (socket, & (sockset))
+#define ENET_SOCKETSET_REMOVE(sockset, socket) FD_CLR (socket, & (sockset))
 #define ENET_SOCKETSET_CHECK(sockset, socket)  FD_ISSET (socket, & (sockset))
 
 #endif /* __ENET_WIN32_H__ */
diff --git a/src/libraries/enet/libenet/protocol.c b/src/libraries/enet/libenet/protocol.c
index 3438a5dad..b8d4863eb 100644
--- a/src/libraries/enet/libenet/protocol.c
+++ b/src/libraries/enet/libenet/protocol.c
@@ -297,7 +297,8 @@ enet_protocol_handle_connect (ENetHost * host, ENetProtocolHeader * header, ENet
               peer = currentPeer;
         }
         else 
-        if (currentPeer -> address.host == host -> receivedAddress.host)
+        if (currentPeer -> state != ENET_PEER_STATE_CONNECTING &&
+            currentPeer -> address.host == host -> receivedAddress.host)
         {
             if (currentPeer -> address.port == host -> receivedAddress.port &&
                 currentPeer -> connectID == command -> connect.connectID)
@@ -819,7 +820,7 @@ enet_protocol_handle_disconnect (ENetHost * host, ENetPeer * peer, const ENetPro
 
     enet_peer_reset_queues (peer);
 
-    if (peer -> state == ENET_PEER_STATE_CONNECTION_SUCCEEDED || peer -> state == ENET_PEER_STATE_DISCONNECTING)
+    if (peer -> state == ENET_PEER_STATE_CONNECTION_SUCCEEDED || peer -> state == ENET_PEER_STATE_DISCONNECTING || peer -> state == ENET_PEER_STATE_CONNECTING)
         enet_protocol_dispatch_state (host, peer, ENET_PEER_STATE_ZOMBIE);
     else
     if (peer -> state != ENET_PEER_STATE_CONNECTED && peer -> state != ENET_PEER_STATE_DISCONNECT_LATER)