From eaac4f0948cdae9f4d2268c49ad625f77783e8ce Mon Sep 17 00:00:00 2001
From: Alec Obradovich <aleco@aroltd.com>
Date: Fri, 21 Dec 2018 13:06:30 -0600
Subject: [PATCH] voov 2 the scroobening

---
 src/server/sock/tcp.h          | 48 ++++++++++++++++++++++++++++++++++
 src/server/sock/tcp_bsd.c      |  5 ++++
 src/server/sock/tcp_win.c      |  2 +-
 src/server/sock/tcp_win.h      | 18 -------------
 src/server/util/thread.c       |  5 ----
 src/server/util/thread.h       |  4 +--
 src/server/util/thread_posix.c |  6 +++++
 src/server/util/thread_win.c   |  6 +++++
 8 files changed, 68 insertions(+), 26 deletions(-)
 create mode 100644 src/server/sock/tcp.h
 create mode 100644 src/server/sock/tcp_bsd.c
 delete mode 100644 src/server/sock/tcp_win.h
 delete mode 100644 src/server/util/thread.c
 create mode 100644 src/server/util/thread_posix.c
 create mode 100644 src/server/util/thread_win.c

diff --git a/src/server/sock/tcp.h b/src/server/sock/tcp.h
new file mode 100644
index 0000000..a4ba8cb
--- /dev/null
+++ b/src/server/sock/tcp.h
@@ -0,0 +1,48 @@
+#ifndef GLV_SOCK_TCP_H
+#define GLV_SOCK_TCP_H
+
+#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+  #ifdef __MINGW32__
+    #undef _WIN32_WINNT
+    #define _WIN32_WINNT _WIN32_WINNT_WIN8
+  #endif
+  #include <winsock2.h>
+  #include <ws2tcpip.h>
+
+  typedef GLV_SOCK_T SOCKET;
+  typedef GLV_ADDR_T SOCKADDR_
+
+  #define GLV_SOCK_T SOCKET
+  #define GLV_ADDR_T SOCKADDR_IN
+#else
+  #include <arpa/inet.h>
+  #include <errno.h>
+  #include <fcntl.h>
+  #include <netdb.h>
+  #include <netinet/in.h>
+  #include <sys/types.h>
+  #include <sys/socket.h>
+  #include <unistd.h>
+
+  #define GLV_SOCK_T int
+  #define GLV_ADDR_T struct sockaddr_in
+#endif
+
+#include <stdint.h>
+
+#define GLV_TCP_FLAG_TYPE   1
+#define GLV_TCP_FLAG_NBIO   2
+
+typedef struct {
+    uint32_t flags;
+} tcp_t;
+
+tcp_t* tcp_create_server();
+tcp_t* tcp_create_client();
+
+
+
+void tcp_destroy(tcp_t* socket);
+
+#endif
diff --git a/src/server/sock/tcp_bsd.c b/src/server/sock/tcp_bsd.c
new file mode 100644
index 0000000..9f793fa
--- /dev/null
+++ b/src/server/sock/tcp_bsd.c
@@ -0,0 +1,5 @@
+#ifndef _WIN32
+#include "tcp.h"
+
+
+#endif
\ No newline at end of file
diff --git a/src/server/sock/tcp_win.c b/src/server/sock/tcp_win.c
index cb4ce34..eb0f656 100644
--- a/src/server/sock/tcp_win.c
+++ b/src/server/sock/tcp_win.c
@@ -1,2 +1,2 @@
-#include "tcp_win.h"
+#include "tcp.h"
 
diff --git a/src/server/sock/tcp_win.h b/src/server/sock/tcp_win.h
deleted file mode 100644
index e0b4577..0000000
--- a/src/server/sock/tcp_win.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef GLOVE_SOCK_TCP_H
-#define GLOVE_SOCK_TCP_H
-
-#include <stdint.h>
-
-#define TCP_FLAG_TYPE           1
-#define TCP_FLAG_NONBLOCKING    2
-
-typedef struct {
-    uint32_t flags;
-} tcp_t;
-
-tcp_t* tcp_create_server();
-tcp_t* tcp_create_client();
-
-void tcp_destroy(tcp_t* socket);
-
-#endif
diff --git a/src/server/util/thread.c b/src/server/util/thread.c
deleted file mode 100644
index c57e838..0000000
--- a/src/server/util/thread.c
+++ /dev/null
@@ -1,5 +0,0 @@
-//
-// Created by alec on 12/20/2018.
-//
-
-#include "thread.h"
diff --git a/src/server/util/thread.h b/src/server/util/thread.h
index cc35afa..09395ab 100644
--- a/src/server/util/thread.h
+++ b/src/server/util/thread.h
@@ -1,4 +1,4 @@
-#ifndef GLOVE_UTIL_THREAD_H
-#define GLOVE_UTIL_THREAD_H
+#ifndef GLV_UTIL_THREAD_H
+#define GLV_UTIL_THREAD_H
 
 #endif
diff --git a/src/server/util/thread_posix.c b/src/server/util/thread_posix.c
new file mode 100644
index 0000000..0f26c01
--- /dev/null
+++ b/src/server/util/thread_posix.c
@@ -0,0 +1,6 @@
+#ifndef _WIN32
+#include "thread.h"
+
+
+
+#endif
diff --git a/src/server/util/thread_win.c b/src/server/util/thread_win.c
new file mode 100644
index 0000000..5e3029a
--- /dev/null
+++ b/src/server/util/thread_win.c
@@ -0,0 +1,6 @@
+#ifdef _WIN32
+#include "thread.h"
+
+
+
+#endif
\ No newline at end of file