client: fix broken vs2008 build

client/application.cpp

@@ -15,8 +15,6 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#define __STDC_FORMAT_MACROS
-#include <inttypes.h>
 #include "common.h"
 #ifdef WIN32
 #include <io.h>

client/common.h

@@ -26,7 +26,11 @@
 #include <errno.h>
 #endif
 
-#include <spice/types.h>
+#define __STDC_FORMAT_MACROS
+#ifndef _WIN32
+#include <inttypes.h>
+#endif
+
 #include <stdio.h>
 #include <string>
 #include <vector>
@@ -74,6 +78,11 @@
 #define RED64
 #endif
 
+#if defined(_WIN32) && !defined(PRIu64)
+#define PRIu64 "I64u"
+#endif
+
+#include <spice/types.h>
 #include "red_types.h"
 
 #endif

client/process_loop.cpp

@@ -236,7 +236,7 @@ unsigned int TimersQueue::get_soonest_timeout()
     if (next_time <= now) {
         return 0;
     }
-    return (next_time - now);
+    return (int)(next_time - now);
 }
 
 

client/red_client.cpp

@@ -24,6 +24,10 @@
 #include "debug.h"
 #include "marshallers.h"
 
+#ifndef INFINITY
+#define INFINITY HUGE
+#endif
+
 #ifdef __GNUC__
 typedef struct __attribute__ ((__packed__)) OldRedMigrationBegin {
 #else