---
client/application.cpp | 8 --------
client/windows/redc.vcproj | 4 ++--
client/x11/Makefile.am | 1 -
3 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/client/application.cpp b/client/application.cpp
index 0fa25b4..73a3461 100644
--- a/client/application.cpp
+++ b/client/application.cpp
@@ -53,10 +53,6 @@
#define CA_FILE_NAME "spice_truststore.pem"
-#ifdef CAIRO_CANVAS_CACH_IS_SHARED
-mutex_t cairo_surface_user_data_mutex;
-#endif
-
static const char* app_name = "spicec";
void ConnectedEvent::response(AbstractProcessLoop& events_loop)
@@ -2017,10 +2013,6 @@ void Application::init_globals()
gdi_canvas_init();
#endif
-#ifdef CAIRO_CANVAS_CACH_IS_SHARED
- MUTEX_INIT(cairo_surface_user_data_mutex);
-#endif
-
Platform::init();
RedWindow::init();
}
diff --git a/client/windows/redc.vcproj b/client/windows/redc.vcproj
index deff391..06d93c0 100644
--- a/client/windows/redc.vcproj
+++ b/client/windows/redc.vcproj
@@ -42,7 +42,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".;..;..\..\common;..\..\common\win;"..\..\common\win\my_getopt-1.5";"$(SPICE_LIBS)\include";"$(SPICE_LIBS)\include\qcairo";"$(SPICE_LIBS)\include\ffmpeg";"$(SPICE_LIBS)\include\CEGUI-0.6.2""
-
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;CAIRO_CANVAS_ACCESS_TEST;CAIRO_CANVAS_CACHE;CAIRO_CANVAS_CACH_IS_SHARED;RED_DEBUG;CAIRO_CANVAS_NO_CHUNKS;_WIN32_WINNT=0x0500;LOG4CPLUS_STATIC;USE_GLZ;PTW32_STATIC_LIB;CEGUI_STATIC"
+
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;CAIRO_CANVAS_ACCESS_TEST;CAIRO_CANVAS_CACHE;RED_DEBUG;CAIRO_CANVAS_NO_CHUNKS;_WIN32_WINNT=0x0500;LOG4CPLUS_STATIC;USE_GLZ;PTW32_STATIC_LIB;CEGUI_STATIC"
MinimalRebuild="false"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -125,7 +125,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".;..;..\..\common;..\..\common\win;"..\..\common\win\my_getopt-1.5";"$(SPICE_LIBS)\include";"$(SPICE_LIBS)\include\qcairo";"$(SPICE_LIBS)\include\ffmpeg";"$(SPICE_LIBS)\include\CEGUI-0.6.2""
-
PreprocessorDefinitions="WIN32;_WINDOWS;CAIRO_CANVAS_ACCESS_TEST;CAIRO_CANVAS_CACHE;CAIRO_CANVAS_NO_CHUNKS;CAIRO_CANVAS_CACH_IS_SHARED;_WIN32_WINNT=0x0500;LOG4CPLUS_STATIC;USE_GLZ;PTW32_STATIC_LIB;CEGUI_STATIC"
+
PreprocessorDefinitions="WIN32;_WINDOWS;CAIRO_CANVAS_ACCESS_TEST;CAIRO_CANVAS_CACHE;CAIRO_CANVAS_NO_CHUNKS;_WIN32_WINNT=0x0500;LOG4CPLUS_STATIC;USE_GLZ;PTW32_STATIC_LIB;CEGUI_STATIC"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
WarningLevel="3"
diff --git a/client/x11/Makefile.am b/client/x11/Makefile.am
index 47cb698..d645c38 100644
--- a/client/x11/Makefile.am
+++ b/client/x11/Makefile.am
@@ -5,7 +5,6 @@ SUBDIRS = images
INCLUDES = \
-DCAIRO_CANVAS_ACCESS_TEST \
-DCAIRO_CANVAS_CACHE \
- -DCAIRO_CANVAS_CACH_IS_SHARED \
-DCAIRO_CANVAS_NO_CHUNKS \
-DUSE_GLZ \
-DUSE_OGL \
--
1.6.6
_______________________________________________
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/spice-devel
