From 6b2947932a0dcc27b4d12866667917f3fa77f781 Mon Sep 17 00:00:00 2001
From: Fred Nicolson <fred.nicolson@outlook.com>
Date: Sun, 22 Jan 2017 14:20:24 +0000
Subject: [PATCH] Bux fixes

Fixed typo causing fr::Packet string extraction to fail.
Fixed Windows compilation error.
---
 include/frnetlib/NetworkEncoding.h | 2 +-
 include/frnetlib/Packet.h          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/frnetlib/NetworkEncoding.h b/include/frnetlib/NetworkEncoding.h
index 0b6867f..1951dd4 100644
--- a/include/frnetlib/NetworkEncoding.h
+++ b/include/frnetlib/NetworkEncoding.h
@@ -15,7 +15,7 @@
 #include <winsock2.h>
 #include <windows.h>
 #include <ws2tcpip.h>
-#DEFINE SOL_TCP SOL_SOCKET
+#define SOL_TCP SOL_SOCKET
 #else
 #define closesocket(x) close(x)
 #define INVALID_SOCKET 0
diff --git a/include/frnetlib/Packet.h b/include/frnetlib/Packet.h
index a2ad159..22f4ba6 100644
--- a/include/frnetlib/Packet.h
+++ b/include/frnetlib/Packet.h
@@ -330,11 +330,11 @@ namespace fr
          */
         inline Packet&operator>>(std::string &var)
         {
-            uint32_t length = (uint32_t)var.length();
+            uint32_t length;
             *this >> length;
 
             var = buffer.substr(buffer_offset, length);
-            buffer_offset += sizeof(length);
+            buffer_offset += length;
 
             return *this;
         }