[Spice-commits] 3 commits - client/threads.cpp client/windows common/lines.h common/pixman_utils.h

[Alexander Larsson]

 client/threads.cpp         |    2 +-
 client/windows/redc.vcproj |    4 ++--
 common/lines.h             |    2 +-
 common/pixman_utils.h      |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 3f94cad6576d0a0fbf50671f94a6ceebdc2b62f6
Author: Alexander Larsson <alexl at redhat.com>
Date:   Mon Apr 12 14:03:06 2010 +0200

    Use upstream name for pthreads lib and new freetype version

diff --git a/client/windows/redc.vcproj b/client/windows/redc.vcproj
index ae94135..29e0bfb 100644
--- a/client/windows/redc.vcproj
+++ b/client/windows/redc.vcproj
@@ -65,7 +65,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="log4cppD.lib pixman-1D.lib libeay32MTd.lib ssleay32MTd.lib ws2_32.lib msimg32.lib winmm.lib libcelt_0_5_1D.lib pthreadsD.lib version.lib CEGUIBase_Static_d.lib CEGUITGAImageCodec_Static_d.lib CEGUIExpatParser_Static_d.lib freetype235MT_D.lib libexpatMT_D.lib pcre_D.lib CEGUIFalagardWRBase_Static_d.lib libjpeg-static-mt-debug.lib"
+				AdditionalDependencies="log4cppD.lib pixman-1D.lib libeay32MTd.lib ssleay32MTd.lib ws2_32.lib msimg32.lib winmm.lib libcelt_0_5_1D.lib pthreadVC2d.lib version.lib CEGUIBase_Static_d.lib CEGUITGAImageCodec_Static_d.lib CEGUIExpatParser_Static_d.lib freetype2312MT_D.lib libexpatMT_D.lib pcre_D.lib CEGUIFalagardWRBase_Static_d.lib libjpeg-static-mt-debug.lib"
 				OutputFile="$(OutDir)\spicec.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(SPICE_LIBS)\lib&quot;"
@@ -144,7 +144,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="log4cpp.lib pixman-1.lib libeay32MT.lib ssleay32MT.lib ws2_32.lib msimg32.lib winmm.lib libcelt_0_5_1.lib pthreads.lib version.lib CEGUIBase_Static.lib CEGUITGAImageCodec_Static.lib CEGUIExpatParser_Static.lib freetype235MT.lib libexpatMT.lib pcre.lib CEGUIFalagardWRBase_Static.lib libjpeg-static-mt.lib"
+				AdditionalDependencies="log4cpp.lib pixman-1.lib libeay32MT.lib ssleay32MT.lib ws2_32.lib msimg32.lib winmm.lib libcelt_0_5_1.lib pthreadVC2.lib version.lib CEGUIBase_Static.lib CEGUITGAImageCodec_Static.lib CEGUIExpatParser_Static.lib freetype2312MT.lib libexpatMT.lib pcre.lib CEGUIFalagardWRBase_Static.lib libjpeg-static-mt.lib"
 				OutputFile="$(OutDir)\spicec.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(SPICE_LIBS)\lib&quot;"
commit d033a7c71efcb1c25505ba21d1d7f8979f550431
Author: Alexander Larsson <alexl at redhat.com>
Date:   Mon Apr 12 13:36:27 2010 +0200

    Fixed vs2008 warning

diff --git a/client/threads.cpp b/client/threads.cpp
index 20774f3..93e2259 100644
--- a/client/threads.cpp
+++ b/client/threads.cpp
@@ -41,7 +41,7 @@ static inline void rel_time(struct timespec& time, uint64_t delta_nano)
 #ifdef WIN32
     struct _timeb now;
     _ftime_s(&now);
-    time.tv_sec = now.time;
+    time.tv_sec = (long)now.time;
     time.tv_nsec = now.millitm * 1000 * 1000;
 #else
     clock_gettime(CLOCK_MONOTONIC, &time);
commit ee035787effaa86d16632b142897aaf3fa29c341
Author: Alexander Larsson <alexl at redhat.com>
Date:   Thu Apr 8 12:05:10 2010 +0200

    Fix win32 build with pixman 0.18.0

diff --git a/common/lines.h b/common/lines.h
index b5f7725..33c8ea9 100644
--- a/common/lines.h
+++ b/common/lines.h
@@ -49,7 +49,7 @@ SOFTWARE.
 #ifndef LINES_H
 #define LINES_H
 
-#include <pixman.h>
+#include <pixman_utils.h>
 #include <stdlib.h>
 #include <string.h>
 #include <spice/draw.h>
diff --git a/common/pixman_utils.h b/common/pixman_utils.h
index ef0cb2b..9fb1be1 100644
--- a/common/pixman_utils.h
+++ b/common/pixman_utils.h
@@ -20,7 +20,7 @@
 #define _H__PIXMAN_UTILS
 
 #include <spice/types.h>
-
+#define PIXMAN_DONT_DEFINE_STDINT
 #include <pixman.h>
 
 #include <spice/draw.h>