FS-7966: fix more msvc 2015 build warnings.

libs/xmlrpc-c/lib/abyss/src/socket_win.c

@@ -277,7 +277,7 @@ channelRead(TChannel *   const channelP,
 			*bytesReceivedP = rc;
 
 			if (ChannelTraceIsActive)
-				fprintf(stderr, "Abyss channel: read %u bytes: '%.*s'\n", bytesReceivedP, (int)(*bytesReceivedP), buffer);
+				fprintf(stderr, "Abyss channel: read %u bytes: '%.*s'\n", *bytesReceivedP, (int)(*bytesReceivedP), buffer);
 		}
 	}
 }

libs/xmlrpc-c/lib/libutil/sleep.c

@@ -1,6 +1,3 @@
-#include "bool.h"
-
-#include "xmlrpc-c/sleep_int.h"
 
 #ifdef WIN32
 #include <windows.h>
@@ -8,6 +5,9 @@
 #else
 #include <unistd.h>
 #endif
+#include "bool.h"
+
+#include "xmlrpc-c/sleep_int.h"
 
 
 void