diff options
| author | Alon Levy <alevy@redhat.com> | 2011-01-27 12:12:41 +0200 |
|---|---|---|
| committer | Alon Levy <alevy@redhat.com> | 2011-01-27 17:19:06 +0200 |
| commit | 645236df2bc908de7abcd6b3d8aab0467ee2d401 (patch) | |
| tree | 1f82041f2f1881e7a746e2228fd0e05e29b7e904 /client | |
| parent | 9394b2c50e8b5d7b336c6603166709ed0637bb81 (diff) | |
| download | spice-645236df2bc908de7abcd6b3d8aab0467ee2d401.tar.gz spice-645236df2bc908de7abcd6b3d8aab0467ee2d401.tar.xz spice-645236df2bc908de7abcd6b3d8aab0467ee2d401.zip | |
client: fix broken vs2008 build
Diffstat (limited to 'client')
| -rw-r--r-- | client/application.cpp | 2 | ||||
| -rw-r--r-- | client/common.h | 11 | ||||
| -rw-r--r-- | client/process_loop.cpp | 2 | ||||
| -rw-r--r-- | client/red_client.cpp | 4 |
4 files changed, 15 insertions, 4 deletions
diff --git a/client/application.cpp b/client/application.cpp index 32050983..3333b0ce 100644 --- a/client/application.cpp +++ b/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> diff --git a/client/common.h b/client/common.h index bda7a191..80911d27 100644 --- a/client/common.h +++ b/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 diff --git a/client/process_loop.cpp b/client/process_loop.cpp index d7e6744f..9a0dadcb 100644 --- a/client/process_loop.cpp +++ b/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); } diff --git a/client/red_client.cpp b/client/red_client.cpp index 18105934..ac045558 100644 --- a/client/red_client.cpp +++ b/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 |