Fix some warnings and windows build

Todo fix tests on windows

include/pubsub/TCPTransport.h

@@ -227,7 +227,7 @@ int ps_tcp_transport_spin(struct ps_transport_t* transport, struct ps_node_t* no
     {
       printf("Failed to Set Socket as Non-Blocking!\n");
       closesocket(socket);
-      return;
+      return 0;
     }
 #endif
 #ifdef ARDUINO

include/pubsub_cpp/Node.h

@@ -17,7 +17,11 @@
 #include <memory>
 
 
-//#include <WS2tcpip.h>
+// todo sometime fix this needing to be here for windows
+// might be a tcp issue
+#ifdef _WIN32
+#include <WS2tcpip.h>
+#endif
 #include <pubsub/Events.h>
 
 namespace pubsub

include/pubsub_cpp/Serialize.h

@@ -179,7 +179,7 @@ ps_msg_t serialize_value(const Value& value, const ps_message_definition_t& defi
 			if (value.type != Array)
 			{
 				// just write the same value n times
-				int size = ps_field_sizes[field.type];
+				size_t size = ps_field_sizes[field.type];
 				float data = value.type == None ? 0.0 : value.flt;
 				for (unsigned int i = 0; i < field.length; i++)
 				{
@@ -191,9 +191,9 @@ ps_msg_t serialize_value(const Value& value, const ps_message_definition_t& defi
 			{
 				// fill it in using the array
 				// just write the same value n times
-				int size = ps_field_sizes[field.type];
+				size_t size = ps_field_sizes[field.type];
 				float data = value.type == None ? 0.0 : value.flt;
-				int len = field.length == 0 ? value.arr.size() : field.length;
+				size_t len = field.length == 0 ? value.arr.size() : field.length;
 				for (unsigned int i = 0; i < len; i++)
 				{
 					float data = i < value.arr.size() ? value.arr[i].flt : 0.0;
@@ -238,8 +238,8 @@ ps_msg_t serialize_value(const Value& value, const ps_message_definition_t& defi
 					pos += 4;
 				}
                 //printf("len: %i at %i\n", len, pos-start);
-				int size = ps_field_sizes[field.type];
-				for (unsigned int j = 0; j < len; j++)
+				size_t size = ps_field_sizes[field.type];
+				for (size_t j = 0; j < len; j++)
 				{
 					double data = j < value.arr.size() ? value.arr[j].flt : 0.0;
 					memcpy(pos, &data, 8);

src/Events.c

@@ -86,7 +86,7 @@ void ps_event_set_add_socket_write(struct ps_event_set_t* set, int socket)
 {
 #ifdef WIN32
   // find the handle and change the select
-  for (int i = 0; i < set->num_handles; i++)
+  for (unsigned int i = 0; i < set->num_handles; i++)
   {
     if (set->sockets[i] == socket)
     {
@@ -117,7 +117,7 @@ void ps_event_set_remove_socket_write(struct ps_event_set_t* set, int socket)
 {
 #ifdef WIN32
   // find the handle and change the select
-  for (int i = 0; i < set->num_handles; i++)
+  for (unsigned int i = 0; i < set->num_handles; i++)
   {
     if (set->sockets[i] == socket)
     {
@@ -139,7 +139,7 @@ void ps_event_set_remove_socket(struct ps_event_set_t* set, int socket)
 #ifdef WIN32
   // find the socket to remove then remove it
   bool found = false;
-  int index = 0;
+  unsigned int index = 0;
   for (; index < set->num_handles; index++)
   {
     if (set->sockets[index] == socket)

src/Subscriber.c

@@ -48,7 +48,7 @@ void ps_sub_destroy(struct ps_sub_t* sub)
 	ps_udp_unsubscribe(sub);
 
 	// unsubcribe from all other transports
-	for (int i = 0; i < sub->node->num_transports; i++)
+	for (unsigned int i = 0; i < sub->node->num_transports; i++)
 	{
 		sub->node->transports[i].unsubscribe(&sub->node->transports[i], sub);
     }

tests/test_cli.cpp

@@ -20,6 +20,9 @@ int ps_okay();
 #include <sstream>
 #include <fstream>
 
+#ifdef _WIN32
+#include <io.h>
+#endif
 #include <pubsub_cpp/Node.h>
 #include <pubsub_cpp/Spinners.h>
 
@@ -41,7 +44,9 @@ std::string execute_command(const std::vector<std::string>& args)
 	int bak, nnew;
 	fflush(stdout);
 	bak = dup(1);
+#ifndef _WIN32
 	nnew = open(tmp_file, O_WRONLY|O_CREAT, S_IRUSR|S_IWUSR);
+#endif
 	dup2(nnew, 1);
 	close(nnew);
 
@@ -55,7 +60,9 @@ std::string execute_command(const std::vector<std::string>& args)
 
 	// Restore stdout
 	fflush(stdout);
+#ifndef _WIN32
 	dup2(bak, STDOUT_FILENO);
+#endif
 	close(nnew);
 
 	// Read in captured std out output

tools/pubsub.cpp

@@ -24,6 +24,9 @@
 #include <sstream>
 #include <fstream>
 
+#undef max
+#undef min
+
 
 using namespace std;