--- client/red_canvas_base.h | 2 -- client/red_gdi_canvas.cpp | 2 -- client/red_gdi_canvas.h | 2 -- client/red_gl_canvas.cpp | 2 -- client/red_gl_canvas.h | 2 -- client/red_sw_canvas.cpp | 2 -- client/red_sw_canvas.h | 2 -- server/reds_gl_canvas.c | 2 -- server/reds_gl_canvas.h | 2 -- server/reds_sw_canvas.c | 2 -- server/reds_sw_canvas.h | 2 -- 11 files changed, 22 deletions(-) diff --git a/client/red_canvas_base.h b/client/red_canvas_base.h index 1506055..d7bd1b6 100644 --- a/client/red_canvas_base.h +++ b/client/red_canvas_base.h @@ -17,10 +17,8 @@ #ifndef _H_RED_CANVAS_BASE #define _H_RED_CANVAS_BASE -#define SPICE_CANVAS_INTERNAL #define SW_CANVAS_CACHE #include "common/canvas_base.h" #undef SW_CANVAS_CACHE -#undef SPICE_CANVAS_INTERNAL #endif diff --git a/client/red_gdi_canvas.cpp b/client/red_gdi_canvas.cpp index 09a1553..dc4b0c2 100644 --- a/client/red_gdi_canvas.cpp +++ b/client/red_gdi_canvas.cpp @@ -27,11 +27,9 @@ #include <stdint.h> #include "common/region.h" -#define SPICE_CANVAS_INTERNAL #define SW_CANVAS_CACHE #include "common/gdi_canvas.c" #undef SW_CANVAS_CACHE -#undef SPICE_CANVAS_INTERNAL #include "common.h" #include "red_gdi_canvas.h" diff --git a/client/red_gdi_canvas.h b/client/red_gdi_canvas.h index dbebe33..397f963 100644 --- a/client/red_gdi_canvas.h +++ b/client/red_gdi_canvas.h @@ -19,11 +19,9 @@ #define _H_GDICANVAS #include "canvas.h" -#define SPICE_CANVAS_INTERNAL #define SW_CANVAS_CACHE #include "common/gdi_canvas.h" #undef SW_CANVAS_CACHE -#undef SPICE_CANVAS_INTERNAL #include "red_pixmap_gdi.h" class RedPixmap; diff --git a/client/red_gl_canvas.cpp b/client/red_gl_canvas.cpp index e8c3f1e..b8ed21e 100644 --- a/client/red_gl_canvas.cpp +++ b/client/red_gl_canvas.cpp @@ -22,11 +22,9 @@ #include <GL/glx.h> #include "common/region.h" -#define SPICE_CANVAS_INTERNAL #define SW_CANVAS_CACHE #include "common/gl_canvas.c" #undef SW_CANVAS_CACHE -#undef SPICE_CANVAS_INTERNAL #include "common.h" #include "red_gl_canvas.h" diff --git a/client/red_gl_canvas.h b/client/red_gl_canvas.h index e78b1cc..8a7314b 100644 --- a/client/red_gl_canvas.h +++ b/client/red_gl_canvas.h @@ -19,12 +19,10 @@ #define _H_GCANVAS #include "canvas.h" -#define SPICE_CANVAS_INTERNAL #define SW_CANVAS_CACHE #include "common/sw_canvas.h" #include "common/gl_canvas.h" #undef SW_CANVAS_CACHE -#undef SPICE_CANVAS_INTERNAL #include "red_pixmap_gl.h" #include "red_window.h" diff --git a/client/red_sw_canvas.cpp b/client/red_sw_canvas.cpp index d18af0f..8473c7a 100644 --- a/client/red_sw_canvas.cpp +++ b/client/red_sw_canvas.cpp @@ -25,11 +25,9 @@ #endif #include "common/region.h" -#define SPICE_CANVAS_INTERNAL #define SW_CANVAS_CACHE #include "common/sw_canvas.c" #undef SW_CANVAS_CACHE -#undef SPICE_CANVAS_INTERNAL #include "common.h" #include "red_window.h" diff --git a/client/red_sw_canvas.h b/client/red_sw_canvas.h index a192c47..6d1ddae 100644 --- a/client/red_sw_canvas.h +++ b/client/red_sw_canvas.h @@ -20,11 +20,9 @@ #define _H_CCANVAS #include "canvas.h" -#define SPICE_CANVAS_INTERNAL #define SW_CANVAS_CACHE #include "common/sw_canvas.h" #undef SW_CANVAS_CACHE -#undef SPICE_CANVAS_INTERNAL class RedPixmap; diff --git a/server/reds_gl_canvas.c b/server/reds_gl_canvas.c index da03ee5..66694e7 100644 --- a/server/reds_gl_canvas.c +++ b/server/reds_gl_canvas.c @@ -21,8 +21,6 @@ #include "common/spice_common.h" #include "reds_gl_canvas.h" -#define SPICE_CANVAS_INTERNAL #define SW_CANVAS_IMAGE_CACHE #include "common/gl_canvas.c" #undef SW_CANVAS_IMAGE_CACHE -#undef SPICE_CANVAS_INTERNAL diff --git a/server/reds_gl_canvas.h b/server/reds_gl_canvas.h index c9da25c..5d49659 100644 --- a/server/reds_gl_canvas.h +++ b/server/reds_gl_canvas.h @@ -18,10 +18,8 @@ #ifndef _H_REDS_GL_CANVAS #define _H_REDS_GL_CANVAS -#define SPICE_CANVAS_INTERNAL #define SW_CANVAS_IMAGE_CACHE #include "common/gl_canvas.h" #undef SW_CANVAS_IMAGE_CACHE -#undef SPICE_CANVAS_INTERNAL #endif diff --git a/server/reds_sw_canvas.c b/server/reds_sw_canvas.c index e7ace3b..297df37 100644 --- a/server/reds_sw_canvas.c +++ b/server/reds_sw_canvas.c @@ -21,8 +21,6 @@ #include "common/spice_common.h" #include "reds_sw_canvas.h" -#define SPICE_CANVAS_INTERNAL #define SW_CANVAS_IMAGE_CACHE #include "common/sw_canvas.c" #undef SW_CANVAS_IMAGE_CACHE -#undef SPICE_CANVAS_INTERNAL diff --git a/server/reds_sw_canvas.h b/server/reds_sw_canvas.h index f065be5..96a4c0c 100644 --- a/server/reds_sw_canvas.h +++ b/server/reds_sw_canvas.h @@ -17,10 +17,8 @@ #ifndef _H_REDS_SW_CANVAS #define _H_REDS_SW_CANVAS -#define SPICE_CANVAS_INTERNAL #define SW_CANVAS_IMAGE_CACHE #include "common/sw_canvas.h" #undef SW_CANVAS_IMAGE_CACHE -#undef SPICE_CANVAS_INTERNAL #endif -- 2.1.0 _______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/spice-devel